Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

8 天以前 52cd0fe6f2224b0bd17b19ddaf475406a92b9ed4

1
2
3
4
spring:
    profiles:
        #233服务器：common-web, global, database, database-ym, database-sp, database-test,database-mj, self
        include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self