nies
|
7d06827898
|
clientModel新增requestId
|
3 years ago |
|
nies
|
f44a69a46c
|
UserDeatilModel增加登录次数字段
|
3 years ago |
|
nies
|
a43b17841f
|
软适配新增SuitRetryModel
|
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
|
a3d2749161
|
(update)SuitModel 增加requestId
|
3 years ago |
jun
|
0ef89f2a6d
|
18934 原材料扣减job替换
|
3 years ago |
|
nies
|
5b5e00eee7
|
model core 增加SysRoleModel
|
4 years ago |
|
nies
|
72673bfa12
|
平台新增用户角色关联model
|
4 years ago |
|
nies
|
5acd3270f9
|
修改pom中版本为1.0.0.1
|
4 years ago |
|
nies
|
968708d1b8
|
删除多余的taskNo
|
4 years ago |
|
聂帅
|
98706bcc20
|
Merge pull request 'test' (#299) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/299
|
4 years ago |
rock.yu
|
9e944b5440
|
解决代码编译不通过的问题
|
4 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 |
Wynne
|
7de40e37f5
|
Merge branch 'dev' into test
|
4 years ago |
|
Wynne
|
bd3dcbac3a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
21a3e58b0c
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
nies
|
51160a4586
|
更新用户导入model
|
4 years ago |
|
nies
|
0a36e83fd5
|
更新用户导入的model
|
4 years ago |
|
puxiao.liao
|
24a0f1026f
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
nies
|
5da810fb20
|
Merge branch 'test' into dev
|
4 years ago |
|
nies
|
1e0f9a847a
|
新增人员导入的model类
|
4 years ago |
|
puxiao.liao
|
1ff31386af
|
规则加载加入路径配置
|
4 years ago |
|
wynne1005
|
d8ad92fe24
|
merge test 还原pom
|
4 years ago |
|
wynne1005
|
08a0ca7937
|
merge dev 还原pom
|
4 years ago |
gsz
|
cb3b714a69
|
Merge branch 'test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-screen/pom.xml
|
4 years ago |
|
nies
|
f9eac5d6af
|
更新AccountExportModel
|
4 years ago |
 王杰
|
a1fcd53e1f
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
王杰
|
c22117f395
|
Merge branch 'test' into dev
|
4 years ago |
|
nies
|
9879d6a7b9
|
新增账户导出的model
|
4 years ago |
|
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
|
wynne1005
|
321209f2b4
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
|
wynne1005
|
7aa3d4bddf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
2b0a7198a5
|
fix(impp-framework core block): 统一提交
还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
|
4 years ago |
|
王杰
|
4fe445e4c3
|
test merge dev
|
4 years ago |
|
puxiao.liao
|
c42a4b250d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
 曾贞一
|
00a12b8a1c
|
【15902 19125+ASN业务收货条码，收货完成后。在打印中心-条码打印状态标记为已打印+0519】
|
4 years ago |
|
王杰
|
5d33795cff
|
test merge dev
|
4 years ago |
|
puxiao.liao
|
a001dae575
|
代码回滚
|
4 years ago |
|
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
|
李俊生
|
85dd71b1ca
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-screen/pom.xml
|
4 years ago |
|
wynne1005
|
83b4cb64df
|
merge dev
|
4 years ago |
|
wynne1005
|
b46bd3b354
|
feat(core): 平台添加用户名登录方式 支持钉钉授权
平台添加用户名登录方式 支持钉钉授权
|
4 years ago |
|
王杰
|
5bf5504992
|
pom
|
4 years ago |
|
puxiao.liao
|
3af79ea582
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
a9881bc01f
|
修复泰国产品条码统计
|
4 years ago |
|
puxiao.liao
|
b6a502475a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
|
4 years ago |