11 Commits (87d9b5c6ecbd2d10e706fdbd45cb95ce3c5cfe4c)

Author SHA1 Message Date
crish 9f9874902d 冲突解决 6 years ago
曾贞一 a4262c5e1e pom文件修改 dev改成test 6 years ago
crish b473fd1b46 pojo开发环境 pom文件修改为dev 6 years ago
crish 87f8dc38a6 测试环境 6 years ago
crish d82e025eb9 dev环境pom文件修改为dev 6 years ago
jimmy.zeng c901f18f89 pom版本还原 6 years ago
WYnneaoapc 5e72d98ad8 提交 6 years ago
曾贞一 8b457c0618 DEV 合并 TEST pom.xml文件修改 6 years ago
于学杰 e7913cfb26 1. 从 TEST 合并代码后 POM 文件中引用的版本不正确,修改为 DEV 6 years ago
wei.peng 521f474753 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test
# Conflicts:
#	modules/i3plus-block-form/src/main/resources/application-test.properties
#	modules/i3plus-block-report/src/main/resources/application-test.properties
合并代码 发版修改配置 - Pw
2019-5-8 20:53:28
6 years ago
alwaysfrin 1dcdf36537 添加mes、mes-pcn、sweb三个微服 6 years ago