You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
puxiao.liao 61d3be19cb 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/bean/WmsDocMovementSn.java
5 years ago
..
i3plus-pojo-andon 安灯导出字=字段冗余 5 years ago
i3plus-pojo-aps 修改导入导出进度明细。 5 years ago
i3plus-pojo-base Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev 5 years ago
i3plus-pojo-form 表单拾取 5 years ago
i3plus-pojo-hardswitch dev分支修改pom 5 years ago
i3plus-pojo-jobflow dev分支修改pom 5 years ago
i3plus-pojo-lac 任务检查校验优化 5 years ago
i3plus-pojo-mes Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
i3plus-pojo-mes-pcn task `1425` pcn pojo 迁移 5 years ago
i3plus-pojo-model 移动mespcn公用model 5 years ago
i3plus-pojo-platform 资源唯一校验调整为key+languageCode+softType 5 years ago
i3plus-pojo-ptl 1,重试 5 years ago
i3plus-pojo-report 自定义报表 调用调整 5 years ago
i3plus-pojo-softswitch 软适配 适配记录参数 分页查询 5 years ago
i3plus-pojo-sweb dev分支修改pom 5 years ago
i3plus-pojo-wms Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
i3plus-pojo-workflow dev分支修改pom 5 years ago