优化了涉企执法情况查询的排序规则

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java

@@ -107,7 +107,7 @@ public class AppEnfCpPlanController extends EfcodeCpPlanController {
      * 计划到期自动生成任务（手动触发，强制匹配并落库）
      * @return
      */
-    @GetMapping("/autoMatchReserve")
+    @GetMapping("/autoTaskReserve")
     public R<Void> autoTaskReserve() {
         int count = cpPlanService.processPlanDeadlineAutoGenTask();
         return R.ok();

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

@@ -252,7 +252,7 @@
                 ${dataFilter}
             </if>
         </where>
-        ORDER BY IFNULL(area.dict_sort, 9999), IFNULL(street.dict_sort, 9999), er.enforcement_time DESC
+        ORDER BY  er.enforcement_time DESC
     </select>
 
     <!-- 报表全量列表查询（统计/导出） -->

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml

@@ -1,12 +1,13 @@
 zdxt:
   file:
     # Windows/Linux 本地开发均可用；生产环境在 application-prod.yml 覆盖
-    upload-path: D:\zfjdm\uploadPath
-#    upload-path: /usr/local/uploadPath
+#    upload-path: D:\zfjdm\uploadPath
+    upload-path: /usr/local/uploadPath
 #    upload-path: /Users/vincent/uploadPath
-#    url-prefix: /profile
- #   qr_code_url: /usr/local/uploads/zfjd_logo.png
- # demo_enabled: false
+    url-prefix: /profile
+    qr_code_url: /usr/local/uploads/zfjd_logo.png
+  demo_enabled: false
+
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
@@ -108,15 +109,15 @@ spring:
 spring.data:
   redis:
     # 地址
-#    host: 139.186.148.21
-    host: 172.16.20.72
+    host: 139.186.148.21
+#    host: 172.16.20.72
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # redis 密码必须配置
-#    password: zdxt@123
-    password:
+    password: zdxt@123
+#    password:
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -354,8 +355,6 @@ xss:
   excludeUrls:
     - /web/enforcementcode/educationServices/add
     - /web/enforcementcode/educationServices/edit
-    - /web/supervision/carouselBanner/add
-    - /web/supervision/carouselBanner/edit
 
 --- # 业务数据双向同步配置
 business-data-sync: