858 Commits (022ec3243eb94b9f506468852f1eee19996b9db7)

Author SHA1 Message Date
nies 945db7f238 合并代码 3 years ago
nies f843878e7e 新增钉钉单聊机器人批量发送消息的model 3 years ago
castle.zang 42a4d10770 sweb供应商自助修改密码 3 years ago
castle.zang 0e5d45d477 sweb供应商自助修改密码 3 years ago
castle.zang 3088b05027 sweb统一登录 3 years ago
nies 6763f73ed9 Merge branch 'test' into ext-dev 3 years ago
castle.zang 7b2d2e816c wms作业流程导入导出功能 3 years ago
nies c229132499 Merge branch 'test' into ext-dev 3 years ago
nies 6b7ecd19b4 suitClientModel增加字段 3 years ago
nies 7c80841f6d Merge branch 'test' into ext-dev 3 years ago
nies 7d06827898 clientModel新增requestId 3 years ago
nies 9b8d5bee8d Merge branch 'test' into ext-dev 3 years ago
nies f44a69a46c UserDeatilModel增加登录次数字段 3 years ago
nies 0c0cfa6f6a Merge branch 'test' into ext-dev 3 years ago
nies a43b17841f 软适配新增SuitRetryModel 3 years ago
nies 2418d6d655 修改ext-dev pojo版本为1.0.0.1 3 years ago
nies c6367b0795 解决screen的冲突 3 years ago
castle.zang 35abd70bae Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang 8a369c31fa 通用数据冷热分离代码,并规范化test分支开发时的依赖,全部依赖1.0-TEST-SNAPSHOT 3 years ago
nies f28f449d4a Merge branch 'test' into ext-dev 3 years ago
nies 058a761500 (update)增加适配重复记录 3 years ago
nies 2619f42700 Merge branch 'test' into ext-dev 3 years ago
nies a3d2749161 (update)SuitModel 增加requestId 3 years ago
nies dd699216ac Merge branch 'test' into ext-dev 3 years ago
jun 0ef89f2a6d 18934 原材料扣减job替换 3 years ago
nies 38add62a60 Merge branch 'test' into ext-dev 4 years ago
nies 5b5e00eee7 model core 增加SysRoleModel 4 years ago
nies 72673bfa12 平台新增用户角色关联model 4 years ago
nies 7bf443a463 WmsActionResponseBean 删除多余的taskNO 4 years ago
nies 5acd3270f9 修改pom中版本为1.0.0.1 4 years ago
nies 968708d1b8 删除多余的taskNo 4 years ago
聂帅 98706bcc20 Merge pull request 'test' (#299) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/299
4 years ago
castle.zang e75c5d35ae 删除多余字段taskNo 4 years ago
nies 17c7ff73d5 Merge branch 'test' into ext-dev 4 years ago
rock.yu 9e944b5440 解决代码编译不通过的问题 4 years ago
puxiao.liao d7b34facf0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
 Conflicts:
	modules/i3plus-pojo-andon/pom.xml
	modules/i3plus-pojo-aps/pom.xml
	modules/i3plus-pojo-base/pom.xml
	modules/i3plus-pojo-bsp/pom.xml
	modules/i3plus-pojo-form/pom.xml
	modules/i3plus-pojo-hardswitch/pom.xml
	modules/i3plus-pojo-ics/pom.xml
	modules/i3plus-pojo-jobflow/pom.xml
	modules/i3plus-pojo-lac/pom.xml
	modules/i3plus-pojo-mdm/pom.xml
	modules/i3plus-pojo-mes-pcn/pom.xml
	modules/i3plus-pojo-mes/pom.xml
	modules/i3plus-pojo-model/pom.xml
	modules/i3plus-pojo-platform/pom.xml
	modules/i3plus-pojo-ptl/pom.xml
	modules/i3plus-pojo-report/pom.xml
	modules/i3plus-pojo-screen/pom.xml
	modules/i3plus-pojo-softswitch/pom.xml
	modules/i3plus-pojo-sweb/pom.xml
	modules/i3plus-pojo-wms/pom.xml
	modules/i3plus-pojo-workflow/pom.xml
	pom.xml
	sonar-project.properties
4 years ago
Dominic_Xiao 30eb4e2194 回滚POM版本 4 years ago
Wynne 7de40e37f5 Merge branch 'dev' into test 4 years ago
Wynne bd3dcbac3a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
puxiao.liao 21a3e58b0c Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
nies 51160a4586 更新用户导入model 4 years ago
nies 0a36e83fd5 更新用户导入的model 4 years ago
puxiao.liao 24a0f1026f Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
nies 5da810fb20 Merge branch 'test' into dev 4 years ago
nies 1e0f9a847a 新增人员导入的model类 4 years ago
puxiao.liao 1ff31386af 规则加载加入路径配置 4 years ago
wynne1005 d8ad92fe24 merge test 还原pom 4 years ago
wynne1005 08a0ca7937 merge dev 还原pom 4 years ago
gsz cb3b714a69 Merge branch 'test' into ext-dev
# Conflicts:
#	modules/i3plus-pojo-screen/pom.xml
4 years ago
nies f9eac5d6af 更新AccountExportModel 4 years ago