汪云昊
|
ec605315bb
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
5 years ago |
|
汪云昊
|
862256e751
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
9241c60f07
|
feat(mdm):通用导入导出及外部应用扩展
|
5 years ago |
wynne1005
|
afc0138e83
|
refactor(core): 支持用户密码过期
commit1 21.4.7
|
5 years ago |
|
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
5 years ago |
andly.pan
|
754124ff25
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
5 years ago |
|
wynne1005
|
1f94eee641
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
6318ca6afc
|
feat(form): 动态表单新增跳转详情页枚举
|
5 years ago |
 王杰
|
2b89e35c69
|
pom
|
5 years ago |
许心洁
|
410b95aefd
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
# modules/i3plus-wms-apiservice/pom.xml
|
5 years ago |
|
王杰
|
5a5874b137
|
test
|
5 years ago |
|
王杰
|
84d9ec15f2
|
pom
|
5 years ago |
|
王杰
|
f1db936f42
|
pom
|
5 years ago |
|
许心洁
|
d107c7a3fe
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
肖奕扬
|
0ee06f6e03
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
汪云昊
|
b03d4bf573
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
cb9add43a3
|
feat(sms):短信模型，枚举调整
|
5 years ago |
 钮海涛
|
2740830e8f
|
合并test代码
|
5 years ago |
 曾贞一
|
bbd5dccbf8
|
【合并分支】
|
5 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
5 years ago |
|
汪云昊
|
2cfbe85ab6
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
60ef8f3b96
|
feat(sms):平台短信功能
|
5 years ago |
|
钮海涛
|
baed7db4ed
|
合并dev代码
|
5 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
5 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
5 years ago |
|
wynne1005
|
b438735172
|
Merge branch 'test' into ext-dev
|
5 years ago |
|
汪云昊
|
23e1eb13a1
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
23f24d297d
|
fix(core):单号生成未正常重置
|
5 years ago |
simon.song
|
effc34f74d
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/pom.xml
|
5 years ago |
|
汪云昊
|
9556c525d9
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
d2fd06cb2b
|
fix(core):单号生成规则没有清除缓存
|
5 years ago |
|
许心洁
|
de9578d439
|
墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
5 years ago |
|
汪云昊
|
bad1234d0e
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
7ecbed2cda
|
fix(order):未固定单号生成长度
|
5 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
汪云昊
|
7a6137a667
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
26e1b39119
|
feat(core):邮件支持附件发送
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
汪云昊
|
5d7397aa4e
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
ee3f9415a7
|
fix(core):组织，部门代码无唯一校验
|
5 years ago |
|
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
|
钮海涛
|
543058b3a5
|
合并sweb代码
|
5 years ago |
|
钮海涛
|
5c104e036f
|
合并test代码
|
5 years ago |
|
汪云昊
|
163d0773a9
|
修改pom文件版本
|
5 years ago |
|
汪云昊
|
55a8bcad72
|
feat(core):系统更新记录功能
|
5 years ago |
|
汪云昊
|
130d3a9792
|
feat:字典规则调整允许值为空
|
5 years ago |
|
汪云昊
|
ab608c0919
|
feat:用户导出
|
5 years ago |