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

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java

@@ -318,4 +318,9 @@ public class EnforcementRegistration {
      */
     private Integer hasEvaluate;
 
+    /**
+     * 其他原因
+     */
+    private String otherReasons;
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml

@@ -519,7 +519,7 @@
                 GROUP BY enterprise_number
             ) ent_count ON er.enterprise_number = ent_count.enterprise_number
             <where>
-                er.is_submit = 1
+                <!--er.is_submit = 1-->
                 <if test="bo.enterpriseId != null and bo.enterpriseId != ''">
                     AND er.enterprise_id = #{bo.enterpriseId}
                 </if>