163 Commits (33e1c1abaf34ffa24135ab6f861961188e932962)

Author SHA1 Message Date
administrator ebbb1b9f34 修改pojo版本号-供优化使用 1 year ago
administrator cf2d693de9 删除不必要代码 2 years ago
administrator e73b97cd47 动态表单调用微服务挂载菜单防止二次挂载 2 years ago
jun 3e8f4b7699 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 2 years ago
castle.zang fa505c38e6 合并test,sentinel和patch-dependency分支 2 years ago
jun 7fc0619f94 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 2 years ago
castle.zang f1cbc90bd1 升级shiro 1.4.0 到1.10.1 2 years ago
nies 2418d6d655 修改ext-dev pojo版本为1.0.0.1 3 years ago
castle.zang 8a369c31fa 通用数据冷热分离代码,并规范化test分支开发时的依赖,全部依赖1.0-TEST-SNAPSHOT 3 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
王杰 fc8619208a pom 4 years ago
王杰 a71774ba24 pom 4 years ago
王杰 21ca70f863 pom 4 years ago
王杰 c6bc2e682a Merge branch 'test' into dev 4 years ago
castle.zang cbef156ac2 方法调用工具类 4 years ago
castle.zang 66653ed536 修改module名字 4 years ago
castle.zang 9b2e0e8508 bsp-server bean 和 repository 4 years ago
王杰 5d33795cff test merge dev 4 years ago
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