汪云昊
|
8e3c1b750a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
35fd2f7952
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
3902fb6309
|
资源增量导入优化
|
5 years ago |
 王杰
|
dfb23bab1d
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
bc61b43e8d
|
安灯人员统计报表工位代码不显示问题修复
|
5 years ago |
陆卫豪
|
5393d6e034
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
zcg
|
586dfb416b
|
[mes枚举修改]
|
5 years ago |
陈思洁
|
40c64db0b1
|
冲突
|
5 years ago |
|
陈思洁
|
ee14ce1d4b
|
【KT-快速入库功能】
|
5 years ago |
jenkins
|
015d284239
|
Jenkins自动合并
|
5 years ago |
puxiao.liao
|
99a1ec309d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
puxiao.liao
|
3bfb0995d5
|
【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位
】bug1299
|
5 years ago |
WYnneaoapc
|
168edce5bd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
48338fec28
|
task `1300` 5 BI 产线运行情况
|
5 years ago |
|
jenkins
|
39f4c733a4
|
Jenkins自动合并
|
5 years ago |
gcj
|
304677e7da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
91e3209ef9
|
【运输管理】
|
5 years ago |
|
王杰
|
c4c615bd15
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
3ff9fbc140
|
安灯图表
|
5 years ago |
|
WYnneaoapc
|
b088b40fd1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
a1a602e457
|
task `1300` 5 BI 产线运行情况
|
5 years ago |
jokelone
|
6995189893
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
46ec9e51b0
|
【任务：1211报表导出冗余字段】
|
5 years ago |
|
jenkins
|
6be1ef7dbd
|
Jenkins自动合并
|
5 years ago |
|
WYnneaoapc
|
ba0a857dd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
b52d5b392d
|
task `1300` 4 BI 产线运行情况
|
5 years ago |
许心洁
|
5a1dc6dc7d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
67f7d66782
|
宁德现场问题#330
|
5 years ago |
|
jokelone
|
874fd139dc
|
Merge branch 'dev' into test
|
5 years ago |
E
|
59bdec9c6f
|
【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举
|
5 years ago |
|
E
|
cc95fad3e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
E
|
ef9293867f
|
【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】
|
5 years ago |
|
WYnneaoapc
|
ef34a13313
|
task `1300` 2 BI 产线运行情况
|
5 years ago |
|
WYnneaoapc
|
e3d84dd48f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
5 years ago |
|
WYnneaoapc
|
b2daf9fd9c
|
task `1300` 1 BI 产线运行情况
|
5 years ago |
|
zcg
|
d6975bf5de
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
ccfba0fe56
|
mes枚举修改
|
5 years ago |
|
jokelone
|
0dfb948810
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
519d985838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
0acf17ddd7
|
【1211：报表1】
|
5 years ago |
|
许心洁
|
927579aca5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
fc663ee283
|
作业流程导入导出BUG#6189
|
5 years ago |
|
汪云昊
|
6b11375a01
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
79377f2da6
|
任务检查相关接口
|
5 years ago |
|
陈思洁
|
45c1fc6571
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
129e60a6df
|
【KT-1284 计划拉动-生产计划管理】
|
5 years ago |
|
gcj
|
a6bb80a5a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
2e98e17a05
|
【运输管理】
|
5 years ago |
|
zcg
|
7016f20282
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
7bf8534c16
|
mes枚举
|
5 years ago |
|
汪云昊
|
03d432993a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
47fb080742
|
lac线程超时监控优化
Session超时时间参数化
lac添加TaskCheck
日志添加索引
|
6 years ago |
|
WYnneaoapc
|
f57f1087d9
|
task `1295` 1 添加数据库索引
|
6 years ago |
 钮海涛
|
8385038290
|
修改甘特图日历接口
|
6 years ago |
qianhs
|
da2cfd77b0
|
【 增加一个扫描零件上的条码，累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】
|
6 years ago |
|
陈思洁
|
7d07580a78
|
合并冲突
|
6 years ago |
|
陈思洁
|
b9844c255b
|
生产计划表结构增加
|
6 years ago |
|
WYnneaoapc
|
2ede8c9dfe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
c6c57dd829
|
task `1294-1` 查找workcell的时候需要带上产线
|
6 years ago |
|
王杰
|
571ab9bd3e
|
获取打印模版参数修改
|
6 years ago |
|
gcj
|
3e6ca8d039
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
a1a3d1e838
|
【Bug清单】------------------------------
|
6 years ago |
|
钮海涛
|
06125eab20
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java
|
6 years ago |
|
钮海涛
|
f5181072b5
|
新增表达式录入界面接口
|
6 years ago |
|
钮海涛
|
68bba613e3
|
新增表达式录入界面接口
|
6 years ago |
|
WYnneaoapc
|
238d0aea3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
efb29aa8f4
|
task `1294-1` 查找workcell的时候需要带上产线
|
6 years ago |
|
钮海涛
|
222e1b020d
|
新增表达式录入界面接口
|
6 years ago |
|
王杰
|
bba25ad2de
|
批量打包model修改
|
6 years ago |
|
E
|
c7d4253e5e
|
【bug 6872 - 收货、发运看板数据未加载】
|
6 years ago |
|
汪云昊
|
bc5beeba7d
|
添加适配记录索引
|
6 years ago |
|
WYnneaoapc
|
9b8675c904
|
task `1292-1` 新增条码履历字段
|
6 years ago |
于学杰
|
67b5069c48
|
1. 增加分组提交的配置字段
|
6 years ago |
|
王杰
|
1f4a8d6e55
|
【安灯修改枚举】
|
6 years ago |
|
jenkins
|
2c88a30b4d
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
6852153227
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
8dc1513947
|
bug`6897` SOP信息-编辑图片后未显示出图片地址
|
6 years ago |
|
jokelone
|
a337f1824f
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
3a353b1539
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
1d5f4b38a4
|
【KT-1282 计划拉动-班次管理】
|
6 years ago |
|
gcj
|
32dccc056c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
6 years ago |
|
gcj
|
1e10bdee0c
|
【坤泰运输管理】
|
6 years ago |
|
WYnneaoapc
|
fc5282342f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
ca952d5211
|
bug`6866` 2 打印模板同步
|
6 years ago |
|
jokelone
|
056dbaacf2
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
eb5f9610a8
|
【KT-1282 计划拉动-班次管理】
|
6 years ago |
|
陈思洁
|
dc8a44df2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
5797ec4b1b
|
新增工位表字段
|
6 years ago |
|
王杰
|
fcc2b09559
|
【安灯修改枚举】
|
6 years ago |
|
WYnneaoapc
|
f4b50200b2
|
bug`6866` 1 打印模板同步
|
6 years ago |
|
jokelone
|
7e0d27f0f4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a0780669c3
|
【任务：1287】
|
6 years ago |
|
zcg
|
032260b9f2
|
[需求：1290，导入excel]
|
6 years ago |
|
陈思洁
|
4f67cc1310
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
61f3465255
|
新增工位表字段
|
6 years ago |
|
jokelone
|
178b30698c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
edcdeb3d4f
|
【任务：1287】
|
6 years ago |
 曾贞一
|
10d8b9626f
|
冲突解决
|
6 years ago |
|
曾贞一
|
cb6fe137d1
|
【bug6863 生产入库时-如果判断该条码未报工】
|
6 years ago |
|
jokelone
|
917774921e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a6730b0cd8
|
【任务：1287产品类型图片】
|
6 years ago |
|
WYnneaoapc
|
64267e19b0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7069bc5cbb
|
task`1287`3` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
许心洁
|
49a126843b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
4fd9ec76f4
|
枚举漏提交
|
6 years ago |
|
许心洁
|
2ce2f17353
|
流程管家：新增“是否连带提交创建状态移动单”属性；新增重置功能+生产扣减交易处理组件+交易处理成功程序+ESB解析程序多余异常输出去除+质检流程加上是否允许多人操作校验+PDA动态菜单交易类型描述国际化
|
6 years ago |
|
王杰
|
2a10fd1021
|
【组织模型工厂加id】
|
6 years ago |
|
钮海涛
|
57b3b4242e
|
新增表达式录入界面接口
|
6 years ago |
|
jokelone
|
8c5eb8d7c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
c42775389d
|
【任务：1273质量检测增加字段】
|
6 years ago |
|
WYnneaoapc
|
2d7558e1ba
|
task`1287`2` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
WYnneaoapc
|
931eea704e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
93bc62b921
|
task`1287` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
汪云昊
|
764a39a6a6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
8c872302a3
|
细节调整
|
6 years ago |
|
jokelone
|
f011aab765
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a4d38de535
|
【任务：1272代码优化】
|
6 years ago |
|
王杰
|
91730dd195
|
【需求：1277，关闭，暂停，完成工单 需要停线，做到方法可配】
|
6 years ago |
|
WYnneaoapc
|
603cd76784
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
5b7f268b91
|
1274 修改组件普遍问题
|
6 years ago |
|
jokelone
|
4025a0963b
|
【任务：1273质量检测增加检测项类型1】
|
6 years ago |
|
jokelone
|
d835ef1bb5
|
【任务：1273质量检测标准增加检测项类型】
|
6 years ago |
|
jokelone
|
a579358968
|
【任务：1257下线时间】
|
6 years ago |
|
钮海涛
|
5e8e05ddb4
|
新增表达式录入界面接口
|
6 years ago |
|
E
|
686cd3dbfa
|
【#1240 KT-发运看板】前端对接调整
|
6 years ago |
|
jokelone
|
690918add5
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
1c9f605c56
|
【VDA成品发运配料-客户发往地】
|
6 years ago |
|
jenkins
|
de173e8500
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
594d6a4135
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
935ca2f4d7
|
【任务：1211报表】
|
6 years ago |
|
王杰
|
3df5888a69
|
更新 'modules/i3plus-pojo-workflow/pom.xml'
|
6 years ago |
|
王杰
|
a254841385
|
更新 'modules/i3plus-pojo-wms/pom.xml'
|
6 years ago |
|
王杰
|
ea8f527309
|
更新 'modules/i3plus-pojo-sweb/pom.xml'
|
6 years ago |
|
王杰
|
be04366551
|
更新 'modules/i3plus-pojo-softswitch/pom.xml'
|
6 years ago |
|
王杰
|
b2210e7425
|
更新 'modules/i3plus-pojo-report/pom.xml'
|
6 years ago |
|
王杰
|
711116d041
|
更新 'modules/i3plus-pojo-platform/pom.xml'
|
6 years ago |
|
王杰
|
4911d184e0
|
更新 'modules/i3plus-pojo-model/pom.xml'
|
6 years ago |
|
王杰
|
5b672e7d68
|
更新 'modules/i3plus-pojo-mes-pcn/pom.xml'
|
6 years ago |
|
王杰
|
b703c9394c
|
更新 'modules/i3plus-pojo-mes/pom.xml'
|
6 years ago |
|
王杰
|
e09345984d
|
更新 'modules/i3plus-pojo-lac/pom.xml'
|
6 years ago |
|
王杰
|
071c218a2e
|
更新 'modules/i3plus-pojo-jobflow/pom.xml'
|
6 years ago |
|
王杰
|
fda76e06c8
|
更新 'modules/i3plus-pojo-hardswitch/pom.xml'
|
6 years ago |
|
王杰
|
f8356637ae
|
更新 'modules/i3plus-pojo-form/pom.xml'
|
6 years ago |
|
王杰
|
5d57bc44d8
|
更新 'modules/i3plus-pojo-base/pom.xml'
|
6 years ago |
|
王杰
|
e43d593db6
|
更新 'modules/i3plus-pojo-aps/pom.xml'
|
6 years ago |
|
王杰
|
d62aec1c62
|
更新 'modules/i3plus-pojo-andon/pom.xml'
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
王杰
|
b9906cee55
|
增加枚举
|
6 years ago |
|
puxiao.liao
|
e580dcbd2d
|
【扫描查询查询一个条码的时候要分行显示该条吗的：库存地，库位，条码，状态，数量，零件号，供应商批次，过期日期，收获批次，需要分行显示】bug6663
|
6 years ago |
|
曾贞一
|
892d63b9b1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
ca71303bee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
b6ae28c957
|
【采购收货】
|
6 years ago |
|
jenkins
|
d2591b419b
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
e4348cd334
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
fa8a88c6d0
|
流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中
|
6 years ago |
|
陆卫豪
|
93126de988
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
gcj
|
1d0c03ba9c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
E
|
831daa4964
|
【#1241 KT-收货看板-增加道口】
|
6 years ago |
|
gcj
|
a35171a41d
|
【采购收货】
|
6 years ago |
|
jenkins
|
f9d508d1ef
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
402b09e82e
|
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
|
6 years ago |
|
王杰
|
338367f3c3
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
6cf0ab98f6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
7004ad0971
|
【任务：1211报表质量数据导出】
|
6 years ago |
|
曾贞一
|
bb92161133
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
64bfbb5013
|
新增甘特图工作块连线功能
|
6 years ago |
|
jenkins
|
7630541146
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
0e2b13d52f
|
【任务：1258枚举优化】
|
6 years ago |
|
王杰
|
52f4854621
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
60e4e1a7f3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
3c9183e422
|
【任务：1256工序BOM改为工位BOM】
|
6 years ago |
|
王杰
|
99b66e459d
|
【需求：1221，导入】
|
6 years ago |
|
钮海涛
|
04009f02e0
|
新增数据校验功能
|
6 years ago |
|
陆卫豪
|
2aca595bad
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
7a379fb5ab
|
【任务：1211报表质量数据首检导出】
|
6 years ago |
|
jenkins
|
33f3fd0963
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
c8f23ba640
|
【 库存报表中无法看到寄售零件】【bug6331】
|
6 years ago |
|
puxiao.liao
|
91ec41b3c0
|
暂时注解掉索引信息。
|
6 years ago |
|
WYnneaoapc
|
1313916b81
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
55b07e8e75
|
1256 工序bom改为工位bom
|
6 years ago |
|
曾贞一
|
793535e74c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
8892c78692
|
【EU成品发运-客户编号】
|
6 years ago |
|
王杰
|
5dd94058cf
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
f038ed7234
|
增加枚举
|
6 years ago |
|
jenkins
|
f4988f68f7
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
7df617b290
|
【质检单查询界面需要支持按照ASN和零件号查询，显示出的明细中质中要显示物料信息】bug6651
|
6 years ago |
|
jenkins
|
66c59fb8ff
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
d05a858bd1
|
6565 修改fastdfs配置，工位监控显示完成数量
|
6 years ago |
|
jenkins
|
ad6d4f5034
|
Jenkins自动合并
|
6 years ago |
|
陈思洁
|
14f509b97a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
42d1a461a4
|
新增附件信息表
|
6 years ago |
|
钮海涛
|
d819f7b6c7
|
修复报表分页问题
|
6 years ago |
|
jenkins
|
66252032b3
|
Jenkins自动合并
|
6 years ago |
|
陈思洁
|
9cb03c8661
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c6ff8f109c
|
新增附件信息表
|
6 years ago |
|
王杰
|
be39fb2abe
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
ff69583e8d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
19c0c1deb5
|
【任务：1211报表】
|
6 years ago |
|
汪云昊
|
56381b76f1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
db019bf4eb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |