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

# Conflicts:
#	cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java

cloud-gateway/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
-  namespace: wx
+  namespace: xyr
 
 # Spring
 spring:

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
-  namespace: wx
+  namespace: xyr
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -19,7 +19,7 @@ spring:
     allow-bean-definition-overriding: true
   application:
     # 应用名称
-    name: cloud-enterprise
+    name: cloud-saas
   profiles:
     # 环境配置
     active: dev
@@ -49,8 +49,6 @@ spring:
         shared-configs:
           # 系统共享配置
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          # 系统环境Config共享配置
-          - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           # xxl-job 配置文件
           - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 

cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java

@@ -93,7 +93,7 @@ public class GenController extends BaseController<BaseEntity> {
         TableDataInfo dataInfo = new TableDataInfo();
         List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
         dataInfo.setRows(list);
-        dataInfo.setTotal(list.size());
+        dataInfo.setTotal((long) list.size());
         return success(dataInfo);
     }