I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,387 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a625f05293'
${ noResults }
Commit Graph

75 Commits (a625f052934c46d280cde51b6de31b5fc1f3ccac)

Author SHA1 Message Date
castle.zang 8a369c31fa 通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT 4 years ago
puxiao.liao d7b34facf0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-andon/pom.xml
	modules/i3plus-pojo-aps/pom.xml
	modules/i3plus-pojo-base/pom.xml
	modules/i3plus-pojo-bsp/pom.xml
	modules/i3plus-pojo-form/pom.xml
	modules/i3plus-pojo-hardswitch/pom.xml
	modules/i3plus-pojo-ics/pom.xml
	modules/i3plus-pojo-jobflow/pom.xml
	modules/i3plus-pojo-lac/pom.xml
	modules/i3plus-pojo-mdm/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-ptl/pom.xml
	modules/i3plus-pojo-report/pom.xml
	modules/i3plus-pojo-screen/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
	sonar-project.properties
 4 years ago
Dominic_Xiao 30eb4e2194 回滚POM版本 4 years ago
wynne1005 bb88851f17 还原pom 4 years ago
wynne1005 e7df36d3e9 还原merge pom 4 years ago
王杰 84d9ec15f2 pom 5 years ago
王杰 f1db936f42 pom 5 years ago
王杰 cd5b882e1f dev merge test pom 冲突解决 5 years ago
许心洁 3d1d05ef1c 1.天津委外发运库存移动单打印 5 years ago
wynne1005 db87c0c32f pom版本 5 years ago
钮海涛 b9283ec075 合并dev代码 5 years ago
钮海涛 b57ae573ed 合并test代码 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 5c104e036f 合并test代码 5 years ago
wynne1005 1e9f1a5c47 质量检测 1 5 years ago
钮海涛 729a7b6990 合并冲突 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
王杰 08cce22dbb dev merge test 5 years ago
王杰 0e3614eb68 test merge dev 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
wynne1005 b0b07437d6 还原pom 5 years ago
wynne1005 60c1f6ecab 还原pom 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
钮海涛 4921d55bda 修复版本问题 6 years ago
钮海涛 b303cf9a14 修复合并问题 6 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 6 years ago
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 6 years ago
钮海涛 53a421b3b9 修复版本问题 6 years ago
王杰 a6e9b90026 pom 6 years ago
王杰 de9017ca5c 冲突 6 years ago
王杰 eaecf4b4b7 pom 6 years ago
王杰 7d192b36a6 pom冲突 6 years ago
钮海涛 005d0f7f86 修复合并问题 6 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
 6 years ago
钮海涛 a1eb3c3bc2 修复pom版本问题 6 years ago
钮海涛 288fb4a16b 修改POM版本号 6 years ago