Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/model/pojo/SmartAuthorGroup.java

@@ -65,10 +65,7 @@ public class SmartAuthorGroup implements Serializable {
     @ApiModelProperty(value = "更新人员")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateUser;
-
-    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
+    
     private Integer deleted;
 
 

src/main/java/com/template/model/pojo/SmartAuthority.java

@@ -66,9 +66,6 @@ public class SmartAuthority implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateUser;
 
-    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
     private Integer deleted;