Merge remote-tracking branch 'origin/develop_master' into develop_master

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java

adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java

@@ -1,7 +1,6 @@
 package com.adc.da.slrs.sysLog.entity;
 
 import com.adc.da.base.entity.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,7 +29,7 @@ public class SysLog extends BaseEntity {
     private String userId;
 
     @ApiModelProperty(value = "操作时间")
-    private String operTime;
+    private DateTime operTime;
 
     @ApiModelProperty(value = "操作类型")
     private String oper;
@@ -56,6 +55,9 @@ public class SysLog extends BaseEntity {
     @ApiModelProperty(value = "接口耗时")
     private int runTime;
 
+    @ApiModelProperty(value = "特殊处理的接口展示内容")
+    private String special;
+
     @TableField(exist = false)
     private String account;