Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

 safePlatfrom-out-web/src/main/resources/config/application.yaml

@@ -1,14 +1,13 @@
spring:
  application:
    name: gkhy-safeplatform-out
    name: safeplatform-out
  profiles:
#    active: prod
    active: out-dev

mybatis-plus:
  mapper-locations: classpath:config/mapper/**/*.xml
#    active: test
    active: guotai-demo

logging:
  config: classpath:config/log/log4j2.xml
  level:
    com.gkhy: info
    com.atomikos: ERROR
    javax.transaction: ERROR