6165 Commits (3a40d278ac6397c37149c7dba90344eb01e90971)
 

Author SHA1 Message Date
钮海涛 b303cf9a14 修复合并问题 5 years ago
钮海涛 a5a032debe 解决model生成数据库表问题 5 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 5 years ago
puxiao.liao 491bc32325 Fix Bug#8345 5 years ago
贾文涛 a68475d3d0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 a8efa90089 bug 7461,count时去掉distinct。Fix Bug #7461 5 years ago
钮海涛 27c62aa7d1 合并冲突 5 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 e578cb882a 优化通用模板代码模糊查询功能 5 years ago
袁津哲 f50b76cd1f Task1858:电枪枪头更换计数 5 years ago
陈思洁 5b167546e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e42641855d 【8528 收货检验-图片上传】 5 years ago
wynne1005 608aa6be90 还原pom 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 6dd2f12a2a Merge branch 'dev' into test 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
wynne1005 a2182f5e42 Merge branch 'test' 5 years ago
wynne1005 e11f9d07d0 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
王杰 8792d72247 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev 5 years ago
王杰 654f1dcc84 【任务:1845,安灯】 5 years ago
王杰 56ae714283 【任务:1845,安灯】 5 years ago
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
wei.peng 9ee8acae91 合并代码 有代码丢失或者文件丢失请排查此处 5 years ago
wei.peng f161270af8 版本发布 5 years ago
钮海涛 c0303cc247 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 281a2dccb5 新增零件自动采购单 5 years ago
王杰 8e94cbb8fa pojo 序列号 5 years ago
袁津哲 8b63dea809 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 08b03c9eb8 Task1858:电枪枪头更换计数 5 years ago
钮海涛 8059342b8f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 4ba0e6b264 自动生成采购订单功能 5 years ago
宋军超 8d2f6fb8d1 任务:【1842】-海纳川基础数据修改字段类型 5 years ago
钮海涛 8a2d54ce61 临时保存 5 years ago
曾贞一 e3accbf24e 【8441 收货回执打印功能完善】 5 years ago
曾贞一 d0e4af979e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6a28329d75 【8441 收货回执打印功能完善】 5 years ago
puxiao.liao f8ccd0166e BUG【8554】 中航-工装初始化导入后,一个excel应该产生一笔事物,明细按物料分 5 years ago
袁津哲 e47f050ff3 优化通用导入工具类和导入逻辑 5 years ago
joke.wang e2ce63a9cd bug: [8533] plc数据类型改为枚举 5 years ago
钮海涛 6c7a88b962 bug:【8520】 5 years ago
joke.wang 88a0d6d02f 任务:[1828] 半成品绑定工步增加逻辑 5 years ago
宋军超 0ccadab4be 任务:【1842】-海纳川通用导入修改对应工具类、实体和model 5 years ago
陈思洁 8ab6e77620 【8528 收货检验-图片上传未开发】 5 years ago
宋军超 1f55c06368 任务:【1842】-海纳川通用导入添加对应工具类、实体和model 5 years ago
袁津哲 5d1c79ef13 Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
袁津哲 6e3da00fda Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
陈思洁 cb317c1edd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 7eb72ee5d1 【调试接口回传和同步】 5 years ago
puxiao.liao a7a1021858 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 40e5297303 8442 中航-BH解绑-事务关联单号赋值 5 years ago