599 Commits (9eb7122e9958cf9be0c47745723be1a2e547c0bb)
 

Author SHA1 Message Date
wei.peng 9eb7122e99 发布 正式版本 1.0 7 years ago
wei.peng cd9c3e667b Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	pom.xml
7 years ago
wei.peng 96bb187b28 发布 正式版本 1.0 7 years ago
yunhao.wang cb95d0a713 项目pom版本更新为test 7 years ago
yunhao.wang 336e2f2901 Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang 680c22e1f1 Excel导入导出 7 years ago
amy a3861b194d modify 7 years ago
柯裕 c95830289a 解决冲突 7 years ago
柯裕 70e1c259e2 优化库存移动单 7 years ago
jimmy 787501c59c 提交代码 7 years ago
Silliter d87eedb285 优化代码 7 years ago
amy 00061db0ca Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 398de72b6c 内部移库单实体字段添加 7 years ago
Silliter 3f5dcf9627 Merge remote-tracking branch 'origin/master' 7 years ago
Silliter ca78fb48fc 优化代码 7 years ago
gragon.xu a23fe003ae Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 660db622a8 组件实体类去掉调用方法属性 7 years ago
Silliter dbdd7834f1 Merge remote-tracking branch 'origin/master' 7 years ago
Silliter 1b54063b56 优化代码 7 years ago
jimmy 4bda89ee5b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 950303231f 提交代码 7 years ago
Silliter a7a39d7016 优化代码 7 years ago
Silliter 06d801be01 优化代码 7 years ago
yunhao.wang 7c37ce05a7 transient 替换为 @Transien 7 years ago
yunhao.wang 838f500156 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
7 years ago
yunhao.wang d7b4b1f7ab transient 替换为 @Transien 7 years ago
jimmy 707d54cc1c 提交代码 7 years ago
amy 63341ac734 Merge remote-tracking branch 'origin/master' 7 years ago
amy 7706f19445 抽点model创建 7 years ago
wei.peng 6683c2bdc1 Merge remote-tracking branch 'origin/master' 7 years ago
wei.peng 5398a45033 Sonar Test 7 years ago
柯裕 ca92b5caed Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 7982a4fdc1 存储区查询条件优化 7 years ago
Silliter e45e68824f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter 800c77cf1d 解决冲突 7 years ago
jessica.chen af863ec5a1 更改质检枚举信息 7 years ago
wei.peng 54d5d84a6b 用户管理优化 7 years ago
柯裕 41ecb414c1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 23e538a5a7 作业任务条件模糊查询 7 years ago
gragon.xu 4b5b6136d7 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu b158c70e60 流程管家v1 7 years ago
yunhao.wang e92db6fd26 Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang 203bfcb231 double非空判断 7 years ago
Silliter 62ab7105e8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter 3b61edb7ab 解决冲突 7 years ago
gragon.xu f66854eb42 dao 7 years ago
gragon.xu 6ab4674a3b 冲突 7 years ago
gragon.xu d2672e33d4 冲突 7 years ago
gragon.xu 805ada2d1f 流程管家create 7 years ago
Silliter 4e44cdad24 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago