Merge branch 'develop' of

https://zhangguoping@gitlab.dituhui.com/bsh/project/project.git into
develop

project-user/src/main/resources/application.yaml

@@ -15,7 +15,6 @@ spring:
         file-extension: yaml
         file-extension: yaml
   config:
   config:
     import:
     import:
-      - optional:nacos:project-user.yaml?group=project&refreshEnabled=true
       - optional:nacos:redis-config.yaml?group=project&refreshEnabled=true
       - optional:nacos:redis-config.yaml?group=project&refreshEnabled=true
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true