12 Commits (c178540545c76ddf12c0e3f3557d55d93534d2e9)

Author SHA1 Message Date
luweihao 12579c7a14 还原pom 5 years ago
王杰 cfa54aa2b6 修改pom 6 years ago
王杰 ac5432bebb 解决冲突 6 years ago
曾贞一 7a62200736 Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml
6 years ago
曾贞一 8b457c0618 DEV 合并 TEST pom.xml文件修改 6 years ago
于学杰 e7913cfb26 1. 从 TEST 合并代码后 POM 文件中引用的版本不正确,修改为 DEV 6 years ago
yunhao.wang 6ebc22e6cc master分支配置调整 6 years ago
yunhao.wang 0171439464 版本发布 2019年3月26日22:47:53 6 years ago
Silliter 111c6177c9 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
alwaysfrin ea2eb6103d 优化调整 6 years ago
wei.peng 8ba027cff5 DEV to TEST 6 years ago
alwaysfrin f775968194 扩展块功能 6 years ago