castle.zang
|
f1cbc90bd1
|
升级shiro 1.4.0 到1.10.1
|
2 years ago |
|
castle.zang
|
1b8347db89
|
动态表单支持原生sql
|
2 years ago |
yanyujia
|
27b8c1133e
|
新增登录优化需要的枚举和字段
|
2 years ago |
|
castle.zang
|
76d35b42e1
|
动态form + ptl_pcn亮灯修改
|
3 years ago |
 臧学普
|
ba6c9200bc
|
Merge pull request '【fix qcMaster附件地址字段,sqlServer没有longtext类型，更改为text】' (#393) from jiaqi.hou/i3plus-pojo-hjq:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/393
|
3 years ago |
jiaqihou
|
40617c9a0b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
jiaqihou
|
3f8aad0496
|
【fix qcMaster附件地址字段,sqlServer没有longtext类型，更改为text】
|
3 years ago |
张祥卫
|
f48e27af5f
|
Merge pull request 'test' (#392) from jiaqi.hou/i3plus-pojo-hjq:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/392
|
3 years ago |
|
jiaqihou
|
53bd4066f2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
jiaqihou
|
374d6596fb
|
【add qcMaster新增附件地址字段，basCustomer新增校验次数字段】
|
3 years ago |
|
castle.zang
|
365ff091f7
|
脚本引擎移植到动态表单---增加系统参数页面
|
3 years ago |
|
castle.zang
|
15e0f1c3f5
|
脚本引擎移植到动态表单
|
3 years ago |
zhang.xw
|
4f6f6878fe
|
ems 异常通知
|
3 years ago |
|
zhang.xw
|
351ed63083
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
zhang.xw
|
e6b8601631
|
xstream 兼容1.4.9
|
3 years ago |
feng.liu
|
e7e4ff1985
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
feng.liu
|
875447706e
|
用户信息导出增加 最后一次登录时间
|
3 years ago |
|
zhang.xw
|
00851bf69f
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
臧学普
|
338c051275
|
Merge pull request '24997 采购订单进度报表增加箱数' (#380) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/380
|
3 years ago |
jun
|
9c4caa09a6
|
24997 采购订单进度报表增加箱数
|
3 years ago |
|
zhang.xw
|
effde55cf9
|
ems新增
|
3 years ago |
|
zhang.xw
|
53303883e9
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
jiaqihou
|
9edb9d33be
|
【fix bas_vendor表新增isSync字段】
|
3 years ago |
|
zhang.xw
|
df46e6498d
|
ems新增
|
3 years ago |
刘峰
|
18c7c3f3fa
|
Merge pull request '中航更改wms物料子检测项字段' (#376) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/376
|
3 years ago |
|
feng.liu
|
2afef80aa8
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
feng.liu
|
5e2987c7ea
|
添加能源管理系统配置
|
3 years ago |
 王宝玉
|
1275a97ef9
|
中航更改wms物料子检测项字段
|
3 years ago |
|
zhang.xw
|
b9f1b3afa4
|
软适配记录新增错误描述
|
3 years ago |
|
刘峰
|
4be6f3104f
|
Merge pull request 'test' (#375) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/375
|
3 years ago |
|
jun
|
7872a3852b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
3 years ago |
|
jun
|
03c85bfdce
|
工单下发需要保存总成物料，工单号加物料号确保唯一
|
3 years ago |
聂帅
|
51e3b28aad
|
Merge pull request '北京扩展对象结构表增加项目代码字段' (#374) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/374
|
3 years ago |
蒋鸿辉
|
613f472ce3
|
北京扩展对象结构表增加项目代码字段
|
3 years ago |
 王杰
|
6d53d3ab15
|
Merge pull request 'pcn-state-cache' (#373) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/373
|
3 years ago |
|
王杰
|
0e33fa5805
|
pcn-state-cache
|
3 years ago |
|
feng.liu
|
eea613e298
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
feng.liu
|
1c9983b03b
|
添加rest请求webservice方式
|
3 years ago |
|
臧学普
|
26963d9036
|
Merge pull request '广东工单拉动需要' (#372) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/372
|
3 years ago |
|
jun
|
efcab52f73
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
3 years ago |
|
jun
|
55c88ec1d4
|
广东工单拉动需要
|
3 years ago |
|
nies
|
8f5180b712
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
885bc0fa05
|
core UserModel新增字段
|
3 years ago |
|
聂帅
|
0c9a06798a
|
Merge pull request '物料配方表新增项目代码,门模位置列（MesPartFormula）' (#370) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/370
|
3 years ago |
|
蒋鸿辉
|
7eeadf733b
|
物料配方表新增项目代码,门模位置列（MesPartFormula）
|
3 years ago |
|
nies
|
797c1ba4fc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
7fd4c36e88
|
新增对账单相关model
|
3 years ago |
|
王杰
|
85e41f0720
|
Merge pull request 'andon' (#369) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/369
|
3 years ago |
|
王杰
|
d070ed170c
|
andon
|
3 years ago |
|
王杰
|
f961782cc6
|
Merge pull request 'andon' (#368) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/368
|
3 years ago |