Merge remote-tracking branch 'origin/master'

# Conflicts: # pigx-config/src/main/resources/config/pigx-upms-dev.yml
2018-10-05 17:42:37 +08:00
commit ee83e781fe
@@ -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
-