Merge branches 'develop' and 'wxz_permission_async' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java

@@ -104,7 +104,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
 
         Object customerId;
         customerId = getFieldValByName(FieldConstant.CUSTOMER_ID_HUMP, metaObject);
-        if (customerId != null) {
+        if (customerId != null && !customerId.equals("")) {
             // 看entity是否手动设置了，设置了就用设置的
             return customerId;
         }

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql

@@ -1,6 +0,0 @@
-ALTER TABLE `project`
-ADD COLUMN `LOCATE_ADDRESS`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]' AFTER `ORG_ID_PATH`,
-ADD COLUMN `LOCATE_LONGITUDE`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位经度' AFTER `LOCATE_ADDRESS`,
-ADD COLUMN `LOCATE_DIMENSION`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`;
-
-

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql

@@ -1,2 +0,0 @@
-update project set locate_address = NULL,locate_longitude = NULL,locate_dimension = NULL;
-