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

 Conflicts:

	dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/impl/ApplyInfoServiceImpl.java

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

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

@@ -1,5 +1,5 @@
-ALTER TABLE T_APPLY_INFO DELETE ORG_ID;
-ALTER TABLE T_APPLY_INFO DELETE MANAGER_ORG_ID;
-ALTER TABLE T_SERVICE_RESOURCE DELETE BUILD_UNIT_ID;
-ALTER TABLE T_SERVICE_RESOURCE DELETE MANAGER_UNIT_ID;
-ALTER TABLE T_SERVICE_RESOURCE DELETE CONTRACT_UNIT_ID;
+ALTER TABLE T_APPLY_INFO DROP COLUMN ORG_ID;
+ALTER TABLE T_APPLY_INFO DROP COLUMN MANAGER_ORG_ID;
+ALTER TABLE T_SERVICE_RESOURCE DROP COLUMN BUILD_UNIT_ID;
+ALTER TABLE T_SERVICE_RESOURCE DROP COLUMN MANAGER_UNIT_ID;
+ALTER TABLE T_SERVICE_RESOURCE DROP COLUMN CONTRACT_UNIT_ID;