15 Commits (be479c2e7695deee1980ae7d8eef5ee3180f5fd2)

Author SHA1 Message Date
曾贞一 2625c2cb0f 【修改 TSET-pom.xml】 5 years ago
王杰 80ca438ce3 test合并到dev解决pom冲突 5 years ago
曾贞一 5ebb5cbf20 【修改 TSET-pom.xml】 5 years ago
王杰 068a0956db 解决冲突 5 years ago
王杰 ab68895760 test分支修改pom 5 years ago
王杰 c87b00756f dev分支修改pom 5 years ago
王杰 d62aec1c62 更新 'modules/i3plus-pojo-andon/pom.xml' 6 years ago
王杰 cfa54aa2b6 修改pom 6 years ago
王杰 ac5432bebb 解决冲突 6 years ago
wei.peng bec3a7098d Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jenkins 298a3c1ddf Merge remote-tracking branch 'origin/dev' into test 6 years ago
Silliter 24af646ad8 安灯项目开发环境搭建 6 years ago
yunhao.wang 6ebc22e6cc master分支配置调整 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 f343ea865c 安灯和硬件适配初始化 6 years ago