castle.zang
|
f24fe9eae3
|
BSP pojo
|
3 years ago |
|
castle.zang
|
8a369c31fa
|
通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT
|
3 years ago |
Xiao-yin0517
|
b9bae06c0c
|
更改实体字段，添加实体
|
4 years ago |
andly.pan
|
8b9883d2f7
|
增加邮件和字段属性
|
4 years ago |
|
Xiao-yin0517
|
a47b8d1785
|
syncDataId改为string类型
|
4 years ago |
|
Xiao-yin0517
|
d74e2f053d
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
|
4 years ago |
|
andly.pan
|
44bbc798c1
|
Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev
|
4 years ago |
|
andly.pan
|
dfa897720e
|
Mdm增加repo
|
4 years ago |
|
andly.pan
|
e66c99e509
|
Mdm修改
|
4 years ago |
|
Xiao-yin0517
|
0f406c54b8
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
|
4 years ago |
|
Xiao-yin0517
|
c4b82c4891
|
更改通过同步数据
|
4 years ago |
|
andly.pan
|
8abe9cb030
|
新增动态配置
|
4 years ago |
|
andly.pan
|
19767dfcc9
|
Merge branch 'ext-dev' of http://git.estsh.com/andly.pan/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
f2cca59ee5
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
46debfb7fb
|
Mdm增加字段
|
4 years ago |
|
andly.pan
|
4890eb87a3
|
Mdm增加字段配置
|
4 years ago |
|
Xiao-yin0517
|
2d2faaaa4c
|
更改实体类
|
4 years ago |
|
andly.pan
|
3dca058857
|
Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev
|
4 years ago |
|
andly.pan
|
0453e33e8f
|
和外部系统同步数据
|
4 years ago |
|
Xiao-yin0517
|
6f1b047725
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
Xiao-yin0517
|
1696ba05e3
|
更改实体类
|
4 years ago |
puxiao.liao
|
a001dae575
|
代码回滚
|
4 years ago |
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
|
Xiao-yin0517
|
7a4ab20483
|
增加了是否禁用和启用
|
4 years ago |
汪云昊
|
ec605315bb
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
|
汪云昊
|
862256e751
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
|
汪云昊
|
9241c60f07
|
feat(mdm):通用导入导出及外部应用扩展
|
4 years ago |
|
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
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 |
|
汪云昊
|
c60daac399
|
feat(mdm):mdmhql工具调整
|
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 |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
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 |
|
王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
5 years ago |