143 Commits (7a39ef9a355f5025a71a9db8d9f9caa3d854b593)

Author SHA1 Message Date
puxiao.liao a001dae575 代码回滚 4 years ago
castle.zang 4fa41f2f90 还原pom version 4 years ago
castle.zang acfba9f367 修复version版本号 4 years ago
曾贞一 93c64328db 【修改-pom.xml】 4 years ago
臧学普 7aa68616bc Merge branch 'master' into test 4 years ago
汪云昊 1ef29d1fce revert(pojo):还原pom版本 4 years ago
wynne1005 385156cd18 refactor(core): SSO 支持方式变更 4 years ago
wynne1005 8b1e28c893 删除mongo依赖 merge test 4 years ago
wynne1005 d627d024a7 移除mongo依赖 4 years ago
wynne1005 62d9679308 删除mongo依赖 4 years ago
王杰 ec3d2f8557 pom 4 years ago
王杰 4644639c2e pom 4 years ago
王杰 2b89e35c69 pom 4 years ago
许心洁 410b95aefd Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
#	modules/i3plus-wms-apiservice/pom.xml
4 years ago
王杰 5a5874b137 test 4 years ago
王杰 84d9ec15f2 pom 4 years ago
王杰 f1db936f42 pom 4 years ago
钮海涛 2740830e8f 合并test代码 4 years ago
钮海涛 d301332162 合并dev代码 4 years ago
王杰 cd5b882e1f dev merge test pom 冲突解决 4 years ago
许心洁 3d1d05ef1c 1.天津委外发运库存移动单打印 4 years ago
simon.song effc34f74d Merge remote-tracking branch 'remotes/origin/test' into ext-dev
# Conflicts:
#	modules/i3plus-pojo-mes-pcn/pom.xml
4 years ago
simon.song 2fa0843841 删除mes-pcn包 4 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
钮海涛 310da99743 合并master代码 5 years ago
汪云昊 a52646a65d Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
5 years ago
汪云昊 26cf4c5e92 feat:mongo模块化 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 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
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
钮海涛 4921d55bda 修复版本问题 5 years ago