273 Commits (yun-zuoyi)

Author SHA1 Message Date
administrator ebbb1b9f34 修改pojo版本号-供优化使用 1 year ago
zhang.xw 5c0afb72d0 新增pojo类 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
jiajia a0f09e89e7 FTP适配器扩展字段用于生成时间文件夹 2 years ago
zhang.xw 4e7ae26df1 软适配sap适配 2 years ago
zhang.xw fcf045ede0 新增 2 years ago
jun 7fc0619f94 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 2 years ago
zhang.xw facd1a4ee4 按创建时间倒叙 2 years ago
jun 4f6c900bcc Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 3 years ago
zhang.xw b9f1b3afa4 软适配记录新增错误描述 3 years ago
nies 250567bc00 Merge branch 'test' into ext-dev 3 years ago
nies bff90c422c blocksoftswitch新增脚本相关pojo 3 years ago
nies b652d0377e Merge branch 'test' into ext-dev 3 years ago
nies bad5dc8134 软适配webservice服务端新增调用对应服务的适配模式 3 years ago
nies ab699b98b8 Merge branch 'test' into ext-dev 3 years ago
link 8c65aa1294 fix miss field 3 years ago
nies c3b145f8dc Merge branch 'test' into ext-dev 3 years ago
link ac152cf3f2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
link b04cedf70b 添加dao的数据接口 3 years ago
nies 0c0cfa6f6a Merge branch 'test' into ext-dev 3 years ago
nies a43b17841f 软适配新增SuitRetryModel 3 years ago
nies 2418d6d655 修改ext-dev pojo版本为1.0.0.1 3 years ago
nies 2255d1dfcf (update)软适配新增适配类型表 3 years ago
castle.zang 35abd70bae Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang 8a369c31fa 通用数据冷热分离代码,并规范化test分支开发时的依赖,全部依赖1.0-TEST-SNAPSHOT 3 years ago
nies 058a761500 (update)增加适配重复记录 3 years ago
nies ccab3f0c04 (update)BsSuitCase增加requestId 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
wynne1005 e7df36d3e9 还原merge pom 4 years ago
王杰 5d33795cff test merge dev 4 years ago
puxiao.liao a001dae575 代码回滚 4 years ago
李俊生 206b522af5 pom冲突 4 years ago
puxiao.liao 2adc935bb0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
 Conflicts:
	modules/i3plus-pojo-mes-pcn/pom.xml
	sonar-project.properties
4 years ago
汪云昊 1ef29d1fce revert(pojo):还原pom版本 4 years ago
汪云昊 46e068ccdb feat(softswitch):REST按状态码重试 4 years ago
汪云昊 2443d1d8e6 feat(softswitch):REST按状态码重试 4 years ago
汪云昊 960ec37cbc Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
汪云昊 a067683998 Merge remote-tracking branch 'remotes/origin/dev' into test 4 years ago
汪云昊 c6031a0fc4 feat(softswitch):添加sap-rfc适配器 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