Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
wangxin
2018-08-20 20:08:04 +08:00

View File

@@ -15,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import com.nis.domain.BaseEntity; import com.nis.domain.BaseEntity;
import com.nis.util.Constants;
import com.nis.util.excel.ExcelField; import com.nis.util.excel.ExcelField;
/** /**
@@ -199,7 +200,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/** /**
* do_log属性在界面do_log:0不需要1记录所有日志2只记录结构化日志。默认是2 * do_log属性在界面do_log:0不需要1记录所有日志2只记录结构化日志。默认是2
*/ */
protected Integer doLog; protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
public Integer getDoLog() { public Integer getDoLog() {