Merge branch 'develop' of 192.168.0.144:xj-aks/dcuc/app-service into develop

dcuc-app-service/src/main/resources/application-base.yml

@@ -75,7 +75,7 @@ mybatis-plus:
 duceap:
   flyway:
     # 是否执行flyway
-    enabled: false
+    enabled: true
     # 执行flyway路径
     locations: classpath:/config/mysql
   mybatis-plus:

dcuc-app-service/src/main/resources/config/mysql/V4_1_0007__app_del_orgid.sql

@@ -1,7 +1,7 @@
 -- 历史数据处理
-UPDATE t_apply_info a
-    JOIN t_org_info o ON a.org_id = o.id
-SET a.org_code = o.CODE;
+-- UPDATE t_apply_info a
+--     JOIN t_org_info o ON a.org_id = o.id
+-- SET a.org_code = o.CODE;
 
 ALTER TABLE T_APPLY_INFO
     DROP COLUMN ORG_ID;