|  puxiao.liao | 48d2f6680a | Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev  Conflicts:
	modules/i3plus-pojo-screen/pom.xml | 5 years ago | 
				
					
						|  李俊生 | 85dd71b1ca | Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test  Conflicts:
	modules/i3plus-pojo-screen/pom.xml | 5 years ago | 
				
					
						|  wynne1005 | 83b4cb64df | merge dev | 5 years ago | 
				
					
						|  钮海涛 | f50d358cdd | Merge remote-tracking branch 'origin/ext-dev' into ext-dev | 5 years ago | 
				
					
						|  wynne1005 | b46bd3b354 | feat(core): 平台添加用户名登录方式 支持钉钉授权 平台添加用户名登录方式 支持钉钉授权 | 5 years ago | 
				
					
						|  andly.pan | 43d7195a37 | Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev | 5 years ago | 
				
					
						|  钮海涛 | 4088a85a5c | 更改左边界计算逻辑:后道工序满模即可开始。 | 5 years ago | 
				
					
						|  joke.wang | 49f709959d | 15711 19081-邮件提醒内容每一条之间增加换行和序号 | 5 years ago | 
				
					
						|  钮海涛 | 3dd67766b2 | 测试时间 | 5 years ago | 
				
					
						|  joke.wang | eef6f8e18b | 节假日 泰国 | 5 years ago | 
				
					
						|  钮海涛 | e918d85702 | Merge remote-tracking branch 'origin/ext-dev' into ext-dev | 5 years ago | 
				
					
						|  钮海涛 | 30048f4ce1 | 修改枚举 | 5 years ago | 
				
					
						|  wynne1005 | 1323569c56 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 5 years ago | 
				
					
						|  wynne1005 | 0c860de567 | feat(SCREEN): 数据对象操作 1 数据对象操作 1 | 5 years ago | 
				
					
						|  王杰 | 844349d583 | 冲突 | 5 years ago | 
				
					
						|  王杰 | 21a3d716f4 | pom | 5 years ago | 
				
					
						|  王杰 | 5bf5504992 | pom | 5 years ago | 
				
					
						|  puxiao.liao | f429c08f30 | Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev | 5 years ago | 
				
					
						|  钮海涛 | ae88dda60d | 新增MDM对象转换工具。 | 5 years ago | 
				
					
						|  puxiao.liao | 3af79ea582 | Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev | 5 years ago | 
				
					
						|  puxiao.liao | a9881bc01f | 修复泰国产品条码统计 | 5 years ago | 
				
					
						|  钮海涛 | 508fd77881 | Merge remote-tracking branch 'origin/ext-dev' into ext-dev | 5 years ago | 
				
					
						|  钮海涛 | 4f697d51ec | 演示问题修复 | 5 years ago | 
				
					
						|  钮海涛 | 63a8aef96d | 演示问题修复 | 5 years ago | 
				
					
						|  汪云昊 | ec605315bb | Merge remote-tracking branch 'remotes/origin/test' into ext-dev | 5 years ago | 
				
					
						|  汪云昊 | 862256e751 | Merge remote-tracking branch 'remotes/origin/dev' into test | 5 years ago | 
				
					
						|  汪云昊 | 9241c60f07 | feat(mdm):通用导入导出及外部应用扩展 | 5 years ago | 
				
					
						|  钮海涛 | 736087852e | 新增成品检验报工 | 5 years ago | 
				
					
						|  钮海涛 | 33be7da477 | 新增成品检验报工 | 5 years ago | 
				
					
						|  wynne1005 | 9c4b233975 | refactor(core): 支持用户密码过期 Finish 21.4.8 | 5 years ago | 
				
					
						|  陈思洁 | 6ffd586274 | 【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】 | 5 years ago | 
				
					
						|  wynne1005 | 5b003a613b | screen修改关系表名 增加历史表 | 5 years ago | 
				
					
						|  wynne1005 | 64c2ed920f | 修改通用界面端口 还原第三方数据库连接字符串中的时区 | 5 years ago | 
				
					
						|  wynne1005 | 714a32a994 | first commit | 5 years ago | 
				
					
						|  puxiao.liao | 2adc935bb0 | Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev  Conflicts:
	modules/i3plus-pojo-mes-pcn/pom.xml
	sonar-project.properties | 5 years ago | 
				
					
						|  github33 | 9a4aae9f68 | Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 5 years ago | 
				
					
						|  github33 | a61f2c1778 | CYCLE_RULE--新增枚举 | 5 years ago | 
				
					
						|  王杰 | 38d03b1060 | 状态机优化 | 5 years ago | 
				
					
						|  wynne1005 | 15633bc28e | tmp | 5 years ago | 
				
					
						|  汪云昊 | 1ef29d1fce | revert(pojo):还原pom版本 | 5 years ago | 
				
					
						|  wynne1005 | a44a4a8be3 | Merge branch 'dev' into test | 5 years ago | 
				
					
						|  汪云昊 | 4272aad4ac | Merge remote-tracking branch 'origin/dev' into dev | 5 years ago | 
				
					
						|  汪云昊 | d45d5175dc | feat(softswitch):REST按状态码重试 | 5 years ago | 
				
					
						|  wynne1005 | 44f61e1525 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 5 years ago | 
				
					
						|  wynne1005 | 385156cd18 | refactor(core): SSO 支持方式变更 | 5 years ago | 
				
					
						|  钮海涛 | ffa0aa94f8 | Merge remote-tracking branch 'origin/ext-dev' into ext-dev | 5 years ago | 
				
					
						|  钮海涛 | caafb9c317 | 修改排程计划逻辑 | 5 years ago | 
				
					
						|  puxiao.liao | f9c3fc705b | Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev | 5 years ago | 
				
					
						|  simon.song | 2dc6a886fe | 14492 19048-产品追溯报表OP10-OP70工位,日期字段显示的信息不对-20210316(时区问题) | 5 years ago | 
				
					
						|  王杰 | f8e0146b19 | pom | 5 years ago | 
				
					
						|  曾贞一 | f05c9bfaa4 | Merge remote-tracking branch 'remotes/origin/test' into ext-dev | 5 years ago | 
				
					
						|  joke.wang | 6a00f4f7f9 | 14539 19081-工艺管理-BYPASS映射关系需按照BYPASS项需要升序排序 | 5 years ago | 
				
					
						|  汪云昊 | 46d94c051a | Merge remote-tracking branch 'remotes/origin/dev' into test | 5 years ago | 
				
					
						|  汪云昊 | af4ce0fa32 | feat(impp):组织结构添加事业部节点 | 5 years ago | 
				
					
						|  钮海涛 | ec35afa34e | Merge remote-tracking branch 'origin/ext-dev' into ext-dev | 5 years ago | 
				
					
						|  钮海涛 | 9f12a44fb6 | 完成插单功能 | 5 years ago | 
				
					
						|  puxiao.liao | aec66afa83 | 修复泰国翻包 | 5 years ago | 
				
					
						|  wynne1005 | b48f30fd47 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 5 years ago | 
				
					
						|  汪云昊 | 960ec37cbc | Merge remote-tracking branch 'remotes/origin/test' into ext-dev | 5 years ago | 
				
					
						|  汪云昊 | a067683998 | Merge remote-tracking branch 'remotes/origin/dev' into test | 5 years ago | 
				
					
						|  andly.pan | 4261e9d34e | Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev | 5 years ago | 
				
					
						|  钮海涛 | a63334c5a1 | 去除事务sop | 5 years ago | 
				
					
						|  wynne1005 | 31f26f5b4f | Merge branch 'dev' into test | 5 years ago | 
				
					
						|  wynne1005 | b8d254e55e | 增加平台配置类型 | 5 years ago | 
				
					
						|  andly.pan | 754124ff25 | Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev | 5 years ago | 
				
					
						|  汪云昊 | c6031a0fc4 | feat(softswitch):添加sap-rfc适配器 | 5 years ago | 
				
					
						|  wynne1005 | 1f94eee641 | Merge branch 'dev' into test | 5 years ago | 
				
					
						|  wynne1005 | 8c3a652ada | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 5 years ago | 
				
					
						|  wynne1005 | 6318ca6afc | feat(form): 动态表单新增跳转详情页枚举 | 5 years ago | 
				
					
						|  王杰 | f4e9bf4603 | Merge branch 'test' into ext-dev | 5 years ago | 
				
					
						|  王杰 | 94d38bb175 | test merge dev | 5 years ago | 
				
					
						|  joke.wang | e2a9222b47 | pcn登陆限制 | 5 years ago | 
				
					
						|  曾贞一 | 76079c9bee | Merge branch 'test' into ext-dev # Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 5 years ago | 
				
					
						|  puxiao.liao | 485fe13202 | Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 5 years ago | 
				
					
						|  puxiao.liao | c880d51c9d | 修复泰国翻包 | 5 years ago | 
				
					
						|  王杰 | dbc417269b | test merge ext-dev | 5 years ago | 
				
					
						|  王杰 | 03d95e2591 | Merge branch 'dev' into test | 5 years ago | 
				
					
						|  王杰 | e66a560661 | 冲突 | 5 years ago | 
				
					
						|  王杰 | 4644639c2e | pom | 5 years ago | 
				
					
						|  王杰 | c06902f8de | 冲突 | 5 years ago | 
				
					
						|  曾贞一 | 462ed4f1de | 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 | 5 years ago | 
				
					
						|  曾贞一 | 7b3ef8f268 | 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 | 5 years ago | 
				
					
						|  曾贞一 | 5af6f3ae7f | 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 | 5 years ago | 
				
					
						|  王杰 | 096e2fc8bf | test merge ext-dev | 5 years ago | 
				
					
						|  王杰 | f0c09ca0e6 | Merge branch 'test' into dev | 5 years ago | 
				
					
						|  王杰 | 2b89e35c69 | pom | 5 years ago | 
				
					
						|  王杰 | 78b5bb0c08 | Merge branch 'test' | 5 years ago | 
				
					
						|  王杰 | 7111a3b60f | pojo | 5 years ago | 
				
					
						|  许心洁 | 071b0ea9ce | Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev # Conflicts:
#	sonar-project.properties | 5 years ago | 
				
					
						|  许心洁 | 410b95aefd | Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms # Conflicts:
#	modules/i3plus-wms-apiservice/pom.xml | 5 years ago | 
				
					
						|  puxiao.liao | 696a0a8c3f | 修复单据条码展开日期 | 5 years ago | 
				
					
						|  王杰 | 25303ffc55 | Merge remote-tracking branch 'i3plus-pojo/dev' into dev | 5 years ago | 
				
					
						|  王杰 | 5a5874b137 | test | 5 years ago | 
				
					
						|  王杰 | 45a1b63a23 | Merge branch 'test' | 5 years ago | 
				
					
						|  王杰 | 84d9ec15f2 | pom | 5 years ago | 
				
					
						|  王杰 | f1db936f42 | pom | 5 years ago | 
				
					
						|  王杰 | d2f03a966e | Merge branch 'dev' into test | 5 years ago | 
				
					
						|  王杰 | 0183ca2a05 | Merge remote-tracking branch 'i3plus-pojo/dev' into dev | 5 years ago | 
				
					
						|  wynne1005 | 665a89a8ae | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 5 years ago | 
				
					
						|  wynne1005 | 5b2f57450b | feat(core): 松下GID单点登录需求 支持E9方式的SSo | 5 years ago |