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

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java

@@ -119,7 +119,7 @@ public class AppEnforcementRegistrationController extends BaseController
             // 今天距离执法时间所差天数
             long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now());
             ee.setOutTimeDayNum(daysBetween);
-            if (daysBetween <= 5) {
+            if (daysBetween <= 4) {
                 res.add(ee);
             }
         }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java

@@ -136,7 +136,7 @@ public class AppEnterpriseComplaintController extends BaseController {
                     ZoneId zoneId = ZoneId.systemDefault();
                     LocalDate calDate = instant.atZone(zoneId).toLocalDate();
                     long daysBetween = ChronoUnit.DAYS.between(calDate, LocalDate.now());
-                    if (daysBetween <= 5) {
+                    if (daysBetween <= 4) {
                         resMap.put("res", endData);
                     } else {
                         resMap.put("res", "0");

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isUnsubscribe != null"> and is_unsubscribe = #{isUnsubscribe}</if>
             <if test="industry != null"> and industry = #{industry}</if>
             <if test="params.reason != null and params.reason == 3">
-                and enterprise_number in (select enterprise_number from enterprise_law_enforcement WHERE curdate() &lt;= DATE_ADD(check_time, INTERVAL 5 DAY))
+                and enterprise_number in (select enterprise_number from enterprise_law_enforcement WHERE curdate() &lt;= DATE_ADD(check_time, INTERVAL 4 DAY))
             </if>
             <if test="enterpriseNumbers != null and enterpriseNumbers.size() > 0 ">
              and enterprise_number in