Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pigx-config/src/main/resources/config/pigx-upms-dev.yml

pigx-config/src/main/resources/config/pigx-codegen-dev.yml

@@ -19,8 +19,3 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
   resources:
     static-locations: classpath:/static/,classpath:/views/
-
-# mybaits 模块配置
-mybatis-plus:
-  typeAliasesPackage: com.pig4cloud.pigx.codegen.entity
-