Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/RuleEnterpriseDTO.java

@@ -32,7 +32,7 @@ public class RuleEnterpriseDTO implements Serializable{
     /**
      * 状态值 1:有效 0:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -110,12 +110,12 @@ public class RuleEnterpriseDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public RuleEnterpriseDTO setStatus(Integer status) {
-        this.status = status;
+    public RuleEnterpriseDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 
@@ -215,7 +215,6 @@ public class RuleEnterpriseDTO implements Serializable{
                 "enterpriseRuleId=" + enterpriseRuleId +
                 ", ruleName='" + ruleName + '\'' +
                 ", enterpriseType=" + enterpriseType +
-                ", status=" + status +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", enterpriseIds='" + enterpriseIds + '\'' +