 王杰
|
de9017ca5c
|
冲突
|
5 years ago |
|
王杰
|
eaecf4b4b7
|
pom
|
5 years ago |
|
王杰
|
c68d49880c
|
Merge branch 'dev' into test
|
5 years ago |
qianhs
|
eb7511c39e
|
bug:8268;8267;8266;8265
|
5 years ago |
joke.wang
|
1fec97f0c1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
24806b9e2e
|
[oee优化]
|
5 years ago |
袁津哲
|
80e572f07d
|
开发回显组件模板管理功能和优化实体生成数据库脚本逻辑
|
5 years ago |
宋军超
|
78ff224fe4
|
删除查询供应商
|
5 years ago |
|
宋军超
|
79e90298ef
|
添加供应商查询
|
5 years ago |
|
宋军超
|
98091426f2
|
修改实体
|
5 years ago |
puxiao.liao
|
a748fbd2f7
|
8426 中航-报表中心-采购计划更改查询-查询条件无效
|
5 years ago |
|
puxiao.liao
|
f765493696
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
|
5 years ago |
|
puxiao.liao
|
70aeae21d3
|
8426 中航-报表中心-采购计划更改查询-查询条件无效
|
5 years ago |
 曾贞一
|
d43935f88a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
7ac98ffbc6
|
【1797 天津麦格纳WMS-定制业务-VDA标签防错验证】
|
5 years ago |
|
宋军超
|
f302b4d5f1
|
修改MES_检验单实体字段
|
5 years ago |
|
宋军超
|
e7335bb632
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
4f5f9777a2
|
修改实体与model字段
|
5 years ago |
 贾文涛
|
f7b3250d70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
abbab6bda4
|
数据权限-工单模块检索添加数据权限功能
|
5 years ago |
 钮海涛
|
8ae8383e79
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
23b06a53af
|
bug:8404
|
5 years ago |
|
袁津哲
|
1a01c44f84
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
袁津哲
|
1dad60b129
|
修改pojo表字段查询页面--添加字段的详细注释，页面查询添加【系统】查询条件Bug：8420
|
5 years ago |
|
joke.wang
|
664bf80434
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
23d1762b5b
|
[bug: 8422 半成品标签打印bug]
|
5 years ago |
|
钮海涛
|
da8b4db890
|
修复pom版本问题
|
5 years ago |
|
宋军超
|
a1579a2484
|
添加过程检测报表model
|
5 years ago |
|
宋军超
|
6d7d8de7b3
|
添加MES_检验单和MES_检验单明细的实体和枚举
|
5 years ago |
|
宋军超
|
32de58277a
|
添加MES_检验单和MES_检验单明细的实体和枚举
|
5 years ago |
|
宋军超
|
7ef769268d
|
添加MES_检验单和检验单明细实体与枚举
|
5 years ago |
|
袁津哲
|
bbbdfae633
|
开发根据系统分类实体信息
|
5 years ago |
许心洁
|
75be7d5078
|
任务#1744：全局替换自定义搜索功能
|
5 years ago |
|
joke.wang
|
5fb7eecee0
|
[任务：1752 oee看板]
|
5 years ago |
|
许心洁
|
ef6330675c
|
任务#1744：全局替换自定义搜索功能
|
5 years ago |
|
贾文涛
|
e668ef4b28
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
eadf0d67f8
|
添加数据权限处理方法
|
5 years ago |
汪云昊
|
e487120301
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
0b3d2d6815
|
软适配REST 适配器调整优化
|
5 years ago |
|
钮海涛
|
f87eeeb491
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
ac268c1cbc
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
917a101f20
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
df2e8601c4
|
task:1719
|
5 years ago |
|
puxiao.liao
|
ba81a26700
|
1778 产品工装关系维护
|
5 years ago |
|
joke.wang
|
f6e2a509f0
|
[任务：1751工厂小时OEE]
|
5 years ago |
陈思洁
|
543f0f5c4c
|
【代码合并还原】
|
5 years ago |
|
joke.wang
|
b450df5754
|
[任务：1752工厂oee]
|
5 years ago |
|
joke.wang
|
142f8e79c6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
f41cd22258
|
[bug: 8353 拍照采集]
|
5 years ago |
wynne1005
|
63bc0b5928
|
merge test
|
5 years ago |