Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/core/domain/entity/SysDept.java

@@ -71,9 +71,9 @@ public class SysDept extends BaseEntity {
     private String email;
 
     /**
-     * 部门状态:1=正常,2=停用
+     * 部门状态:1=启用,2=停用
      */
-    @Excel(name = "状态", readConverterExp = "1=正常,2=停用")
+    @Excel(name = "状态", readConverterExp = "1=启用,2=停用")
     private String status;
 
     /**