141 Commits (f7172d63abc1f30fd28b41efa328c073119d2666)

Author SHA1 Message Date
jimmy 9cda18eb32 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy e5567ce4eb 修改代码 7 years ago
gragon.xu 690d9ef408 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu b3faaf50f4 库存交易前后端以及(11月19日)所有的小bug 7 years ago
alwaysfrin 4aa58b943d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
alwaysfrin 0e5a97f783 微服优化,pom调整 7 years ago
wei.peng 470dbb015e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
wei.peng ef85c84e68 1、BaseRepositoryImpl 根据ID 查询Bug 修复
2、更新字段名,更新对象名称
7 years ago
frin.fei 80962cf2b3 初始化服务注册中心icloud center service 7 years ago
frin.fei 86809c2027 Merge remote-tracking branch 'origin/master' 7 years ago
frin.fei 9867152278 微服调整 7 years ago
jessica.chen 145182f2da 更改模块 7 years ago
jessica.chen 9b529bf438 更改模块 7 years ago
amy ccdfc19aff 库存移动单状态枚举添加 7 years ago
jimmy b2d19f7cbf 合并sql 7 years ago
jimmy 64ea8f7fab 开发盘点主表、盘点冻结表、盘点实盘表 7 years ago
amy 21a79af65a 合并 7 years ago
gragon.xu b02c8f4674 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
#	modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java
7 years ago
gragon.xu 12392de1a4 库存,库存条码,库存交易信息,库存交易条码V1 7 years ago
柯裕 0634674c83 解决冲突 7 years ago
柯裕 c87c038410 meiju 7 years ago
gragon.xu fe92584fa8 开窗 7 years ago
gragon.xu 3fdeb69eee dragon 7 years ago
wei.peng dec260e3ca 代码优化 7 years ago
yunhao.wang 4303d11fa5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
yunhao.wang 1b76c95b7a 站内信 全部完成 7 years ago
gragon.xu 6f524abe28 枚举 7 years ago
Silliter eb8795e1a6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter d5b71f274f 单元测试开发工具类新增 7 years ago
jimmy fe5538386a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
7 years ago
jimmy be354e6dd3 增加枚举 7 years ago
柯裕 4ebe75e66c 新建枚举 7 years ago
amy c82ba74e9e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 88429e342e 枚举修改 7 years ago
frin.fei 3a34cfbd6b eureka、feign整合 7 years ago
frin.fei f07489d04d eureka、feign整合 7 years ago
yunhao.wang 4fb5f548cf 定时任务 完成
表达式   完成
邮件工具类
7 years ago
Silliter d49a2661cf Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter f677400273 单元测试开发工具类新增 7 years ago
frin.fei 6a9ecc9543 Merge remote-tracking branch 'origin/master' 7 years ago
frin.fei b77fc7f291 微服调整 7 years ago
wei.peng 2e8e2895c7 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
yunhao.wang 67a45fa7ac Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang f8579cdfc6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
# Conflicts:
#	modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java

语言管理 完成
资源管理 完成
7 years ago
wei.peng 98d60b8443 用户信息拆分 合并代码处理 7 years ago
wei.peng 6991ab1599 用户信息拆分 7 years ago
amy 477f6c5ff1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 22d5ba1c0f 字段修改 7 years ago
jimmy b9db3d0076 开发po订单主表、明细表 7 years ago
jimmy 6fc6519382 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago