|  王杰 | b77d3065a4 | Merge branch 'test' into dev | 6 years ago | 
				
					
						|  许心洁 | 3d3f134d7f | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | c9f6f336af | 动态查询:解决了BUG#7658,7660,7661,7663,7664 3D仓库:联调优化逻辑 | 6 years ago | 
				
					
						|  曾贞一 | 0acf2dc0ae | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  钮海涛 | b323b2feae | Merge remote-tracking branch 'origin/dev' into test | 6 years ago | 
				
					
						|  luweihao | 00252caa0c | 移动mespcn公用model | 6 years ago | 
				
					
						|  许心洁 | cc98e84ba4 | 动态查询:增加开窗功能 | 6 years ago | 
				
					
						|  luweihao | f67dd06cd4 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  许心洁 | b8d7feb413 | 动态查询:添加固定查询条件:isValid,isDeleted   +   给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解 +
字段无需区分工厂 | 6 years ago | 
				
					
						|  luweihao | 66f7121975 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  许心洁 | 632ad62c45 | 动态查询:查询类名需作为动态入参 | 6 years ago | 
				
					
						|  luweihao | 246dd85721 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  许心洁 | 55e3f212ce | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 7f161e3bae | 3D可视化仓库 | 6 years ago | 
				
					
						|  jenkins | 1ada447069 | Jenkins自动合并 | 6 years ago | 
				
					
						|  puxiao.liao | 53a2152ff1 | 【 7531 在网页的条码打印界面增加一个按钮,可以修改部分条码数量,修改条件,库位为空,库区有值,条码状态为待入库。此部分条码为日生产计划生成的条码。 】bug7531 | 6 years ago | 
				
					
						|  jenkins | 24d834cd6d | Jenkins自动合并 | 6 years ago | 
				
					
						|  qianhs | e1114d67d2 | 【静态盘点解冻调差时,如果勾选了所有盘点单,现在需要一个单子一个单子点击确认调差,需要在点击时将所有盘点单的调差范围都显示出来,然后一次性调差所有功能】【bug7485】 | 6 years ago | 
				
					
						|  jenkins | 335c725bca | Jenkins自动合并 | 6 years ago | 
				
					
						|  qianhs | 4ccda48061 | 【 PDA所有流程中,扫描后默认提示的组件去除】【bug7409】 | 6 years ago | 
				
					
						|  jenkins | 27b1f5ca21 | Jenkins自动合并 | 6 years ago | 
				
					
						|  qianhs | 22eaa30dab | 【收货时,如果多收了零件号,点击重置后再扫描单号,该零件号明细无法显示在下方提示中。】【bug7423】 | 6 years ago | 
				
					
						|  jenkins | a3823f4a16 | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | 2d30f2da0f | Wms动态搜索与自定义列表,表单开发 | 6 years ago | 
				
					
						|  jenkins | d790bcf355 | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | 67ef5c5516 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  袁津哲 | 89a7cafee4 | Wms动态搜索与自定义列表,表单开发 | 6 years ago | 
				
					
						|  jenkins | 33e68b7e9f | Jenkins自动合并 | 6 years ago | 
				
					
						|  wei.peng | cb68f62e46 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  wei.peng | 8a4974f369 | 自定义报表 调用调整 | 6 years ago | 
				
					
						|  jenkins | 6371e8df60 | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | f7c98e3982 | Wms动态搜索与自定义列表,表单开发 | 6 years ago | 
				
					
						|  jenkins | a19cace3b1 | Jenkins自动合并 | 6 years ago | 
				
					
						|  puxiao.liao | b64327831a | 【 7402 收货回执界面,查询条件增加一个ASN组号,显示列表中也增加一个ASN组号 】bug7402 | 6 years ago | 
				
					
						|  jenkins | c1609539cf | Jenkins自动合并 | 6 years ago | 
				
					
						|  许心洁 | de0d57179c | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 35839db806 | BUG#7359 任务列表分组字段和移动单赋值逻辑更改 | 6 years ago | 
				
					
						|  jenkins | a0b67a3723 | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | 8285c87624 | Wms动态搜索与自定义列表,表单开发 | 6 years ago | 
				
					
						|  jenkins | 782574c73d | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | 29220002b1 | Wms动态搜索与自定义列表,表单开发 | 6 years ago | 
				
					
						|  jenkins | 56e53906ec | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | cf92fb2b23 | Wms动态搜索与自定义列表,表单开发 | 6 years ago | 
				
					
						|  汪云昊 | 536200cf2b | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  袁津哲 | 2f2f24356c | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  袁津哲 | daf3365ce3 | Wms初始化扫描实体字段新增逻辑优化 | 6 years ago | 
				
					
						|  宋军超 | d05fd542b3 | 2020-01-08添加列表菜单与对应和关系逻辑 | 6 years ago | 
				
					
						|  宋军超 | b9f3ea144f | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  宋军超 | bca93691ba | 2020-01-08添加列表菜单与对应和关系逻辑 | 6 years ago | 
				
					
						|  袁津哲 | 7d4ba10449 | Wms初始化扫描实体字段新增逻辑优化 | 6 years ago | 
				
					
						|  jenkins | 852be5a130 | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | 76b5087e60 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  袁津哲 | f323637c94 | Wms初始化扫描实体字段新增逻辑优化 | 6 years ago | 
				
					
						|  jenkins | b0bbf43a9b | Jenkins自动合并 | 6 years ago | 
				
					
						|  宋军超 | b0f60a9176 | 2020-01-08创建动态列表与查询model | 6 years ago | 
				
					
						|  jenkins | a685cd208d | Jenkins自动合并 | 6 years ago | 
				
					
						|  许心洁 | fe809e2eff | 定时处理遗漏的待处理移动单JOB:处理周期改为可配置的JOB参数+流程管家:在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错 | 6 years ago | 
				
					
						|  WYnneaoapc | adb4bd2a1c | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  许心洁 | 7594b3d515 | SAP取消指令:按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消 | 6 years ago | 
				
					
						|  jenkins | a104276c01 | Jenkins自动合并 | 6 years ago | 
				
					
						|  汪云昊 | b0b671aac0 | 软适配 数据源适配器优化 | 6 years ago | 
				
					
						|  WYnneaoapc | 569c2613fe | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  wei.peng | 391d4005ad | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  wei.peng | f768247c4f | 代码合并 2019-12-30 15:59:52 | 6 years ago | 
				
					
						|  jenkins | d32900413a | Jenkins自动合并 | 6 years ago | 
				
					
						|  许心洁 | 8143afeea9 | 拣货:条码的数量不能小于0+定时处理遗漏的待处理移动单JOB+closeTaskDetails函数还需要软删单据明细的状态 | 6 years ago | 
				
					
						|  wei.peng | 3b7b374b23 | 自定报表对象模型调整 | 6 years ago | 
				
					
						|  王杰 | 7287aaeb77 | 其他组未提交的代码 | 6 years ago | 
				
					
						|  汪云昊 | 20ccf65c5c | 资源加载优化 | 6 years ago | 
				
					
						|  jenkins | 4e8ee475b4 | Jenkins自动合并 | 6 years ago | 
				
					
						|  gcj | 99eaa8b8ca | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev  Conflicts:
	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 6 years ago | 
				
					
						|  gcj | fc9b8629ab | 【采购收货】 | 6 years ago | 
				
					
						|  jenkins | cc45dbc2cb | Jenkins自动合并 | 6 years ago | 
				
					
						|  曾贞一 | 393d3f12b8 | 【7055 新增波次拣货流程】 | 6 years ago | 
				
					
						|  王杰 | ab68895760 | test分支修改pom | 6 years ago | 
				
					
						|  王杰 | c87b00756f | dev分支修改pom | 6 years ago | 
				
					
						|  gcj | a7d1ec785b | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  qianhs | fdfc5884c5 | 【 	库存调整盘点(两个界面)需要可以扫描库位以后立刻提交。】【bug7040】 | 6 years ago | 
				
					
						|  jenkins | 78d80f03cf | Jenkins自动合并 | 6 years ago | 
				
					
						|  qianhs | 15d3d3b5e1 | 【 	库存调整盘点(两个界面)需要可以扫描库位以后立刻提交。】【bug7040】 | 6 years ago | 
				
					
						|  jenkins | 34b843bd1f | Jenkins自动合并 | 6 years ago | 
				
					
						|  曾贞一 | f800d3dd7b | 【成品发运,获取在途库位逻辑修改】 | 6 years ago | 
				
					
						|  汪云昊 | e062055661 | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  汪云昊 | 4632c7572c | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  汪云昊 | 3dd247491a | 软件适配器异常信息优化 | 6 years ago | 
				
					
						|  WYnneaoapc | 2a3499de65 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  WYnneaoapc | 6d357abe9f | task `1304` 2 活化开线管控 | 6 years ago | 
				
					
						|  jokelone | 0dfb948810 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  许心洁 | fc663ee283 | 作业流程导入导出BUG#6189 | 6 years ago | 
				
					
						|  jokelone | 056dbaacf2 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  WYnneaoapc | 5b7f268b91 | 1274 修改组件普遍问题 | 6 years ago | 
				
					
						|  E | 686cd3dbfa | 【#1240 KT-发运看板】前端对接调整 | 6 years ago | 
				
					
						|  王杰 | 4911d184e0 | 更新 'modules/i3plus-pojo-model/pom.xml' | 6 years ago | 
				
					
						|  王杰 | cfa54aa2b6 | 修改pom | 6 years ago | 
				
					
						|  jenkins | d2591b419b | Jenkins自动合并 | 6 years ago | 
				
					
						|  许心洁 | fa8a88c6d0 | 流程管家:提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值,给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范,已移至Pojo-Model项目中 | 6 years ago | 
				
					
						|  jenkins | 66c59fb8ff | Jenkins自动合并 | 6 years ago | 
				
					
						|  WYnneaoapc | d05a858bd1 | 6565 修改fastdfs配置,工位监控显示完成数量 | 6 years ago | 
				
					
						|  陈思洁 | d0e6d30a9e | #6639 【VDA生产领料-FIFO跳过-系统异常】 | 6 years ago | 
				
					
						|  陈思洁 | 42a6f8a02d | 【#1219 在宁德现有生产扣减JOB基础上增加生成领料单功能】 | 6 years ago | 
				
					
						|  王杰 | 73b1e827d6 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  许心洁 | 48e136c4aa | 任务列表展示创建人 | 6 years ago | 
				
					
						|  王杰 | 09cf450156 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  crish | 4d3adf5daf | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  汪云昊 | f0e77305dd | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  汪云昊 | 3856a6d600 | LAC调整微服务指令集操作方式 OPC UA工具订阅方式调整 | 6 years ago | 
				
					
						|  曾贞一 | ff1f561b9d | 消息样式实体类 增加一条 | 6 years ago | 
				
					
						|  王杰 | ac5432bebb | 解决冲突 | 6 years ago | 
				
					
						|  jenkins | 8eb8c2f97e | Merge branch 'master' of i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  王杰 | 9f9c095846 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  汪云昊 | c4ed0f1f37 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  汪云昊 | 12ba5d2ff3 | lac微服务模式优化 | 6 years ago | 
				
					
						|  王杰 | a595fed4fe | Merge branch 'test' | 6 years ago | 
				
					
						|  汪云昊 | c0d8375d0f | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  许心洁 | 8d6a2b53b1 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | b7c6189308 | 生产汇报JOB优化(新增根据多个属性值将对象集合进行分组的公共方法)+标准收货速度优化(30%) | 6 years ago | 
				
					
						|  王杰 | 64d631c180 | Merge branch 'test' | 6 years ago | 
				
					
						|  汪云昊 | f95482501b | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  crish | 410558d43c | Merge branch 'test' | 6 years ago | 
				
					
						|  汪云昊 | 7cb9ffd37b | Lac细节优化 OPC调整 | 6 years ago | 
				
					
						|  陆卫豪 | 3fa5437c5a | Merge branch 'dev' of i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  WYnneaoapc | 360f908ae4 | 获取生产数据 6283 | 6 years ago | 
				
					
						|  许心洁 | 208410340e | Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 6 years ago | 
				
					
						|  张哲铭 | 6871e96496 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  许心洁 | 5dc8ffb394 | 日志处理队列V1.0 | 6 years ago | 
				
					
						|  crish | c4d7a2380c | Merge branch 'test' | 6 years ago | 
				
					
						|  许心洁 | 9755e5f751 | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  wei.peng | da7ba77dab | LAC 跨服务调用软适配接口完成 | 6 years ago | 
				
					
						|  王杰 | d2c7a81893 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  汪云昊 | 154bba4b3b | LAC 调度模式优化 | 6 years ago | 
				
					
						|  王杰 | 2417b40635 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  汪云昊 | cfd7f5276e | 实体调整 | 6 years ago | 
				
					
						|  许心洁 | 9c54b2561c | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  汪云昊 | 50bf9300ba | LAC 调度模式完成 | 6 years ago | 
				
					
						|  王杰 | 7291a7a85c | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  汪云昊 | 86a18d730a | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  汪云昊 | 9907813aed | Lac调度实体 | 6 years ago | 
				
					
						|  王杰 | 9446a76159 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  wei.peng | aeff042046 | 添加 组织代码查询 | 6 years ago | 
				
					
						|  许心洁 | c79786a677 | 合并开发分支的代码POM文件被改成DEV修改回TEST | 6 years ago | 
				
					
						|  crish | 18161e8191 | Merge branch 'test' | 6 years ago | 
				
					
						|  WYnneaoapc | 3dbbee3c60 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 3bc277178e | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  crish | 3e9cc95017 | pojo-model加入andon-pojo依赖 | 6 years ago | 
				
					
						|  crish | 2906667856 | mes定时获取安灯安灯任务信息 | 6 years ago | 
				
					
						|  WYnneaoapc | b47f97fa05 | 1050-2 工位监控 | 6 years ago | 
				
					
						|  许心洁 | 77fefbcf74 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  许心洁 | 5956d5a08e | 冲销:需求变更优化 | 6 years ago | 
				
					
						|  crish | 15e812c7a6 | Merge branch 'test' | 6 years ago | 
				
					
						|  许心洁 | 02055a8b7e | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  许心洁 | 18789939b0 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  crish | 0526da8ee3 | Merge branch 'test' | 6 years ago | 
				
					
						|  crish | cd74f5336f | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  wei.peng | 689f6057c1 | 添加查询账号接口 | 6 years ago | 
				
					
						|  刘辉 | febbea09c3 | Merge branch 'dev' of i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  changjiang.gao | 69e8357c69 | 条码数量编辑 | 6 years ago | 
				
					
						|  许心洁 | a1597c089c | 成品冲销+导入转换格式(就一个不知道是什么单导入) | 6 years ago | 
				
					
						|  crish | 1de89d732b | 本地误拉了test代码,解决pom | 6 years ago | 
				
					
						|  crish | 9f9874902d | 冲突解决 | 6 years ago | 
				
					
						|  曾贞一 | e603ac66a7 | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  许心洁 | 4809b8bc83 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 16839f6911 | 成品冲销+抛异常方法封装优化 | 6 years ago | 
				
					
						|  陆卫豪 | 413266293e | Merge branch 'dev' of i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  WYnneaoapc | 56d7457826 | 工位监控提交 | 6 years ago | 
				
					
						|  许心洁 | 7863325afd | 本地误拉了测试的代码,还原后提交,在测试分支拉开发分支的代码也得还原 | 6 years ago | 
				
					
						|  许心洁 | b7b78b85ac | 误拉了test分支的代码:还原 | 6 years ago | 
				
					
						|  汪云昊 | 52a5fe74af | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  wei.peng | d9dd10761e | WebService 欧洲对接完成 | 6 years ago | 
				
					
						|  许心洁 | 8deff73454 | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  wei.peng | f35461ef57 | WebService Server 优化完成 | 6 years ago | 
				
					
						|  wei.peng | 508d4b5aba | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev  Conflicts:
	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 6 years ago | 
				
					
						|  汪云昊 | d83de01d33 | 服务端适配日志bug解决 | 6 years ago | 
				
					
						|  刘辉 | 722146acd8 | Merge branch 'dev' of i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  许心洁 | d406532b37 | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  wei.peng | 1e5e35ee6f | Pojo 合并代码 | 6 years ago | 
				
					
						|  wei.peng | babaf2f7d6 | WebService 客户端Xml参数调试成功 | 6 years ago | 
				
					
						|  汪云昊 | f3867c64f4 | 软适配微服务接口 | 6 years ago | 
				
					
						|  wei.peng | 61a38c9acd | WebService Server 优化完成 | 6 years ago | 
				
					
						|  crish | 0924810e64 | Merge branch 'test' | 6 years ago | 
				
					
						|  王杰 | 18bc35f60d | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  lbwgithub | c67fe92297 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  lbwgithub | 3e8bcbeb84 | 枚举 | 6 years ago | 
				
					
						|  WYnneaoapc | 60f441e685 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  wei.peng | d495046dcf | 添加XML 工具实现 | 6 years ago | 
				
					
						|  刘辉 | 60d1798b9c | Merge branch 'dev' of i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  许心洁 | 1e41ab2e39 | Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 6 years ago | 
				
					
						|  汪云昊 | bd55a18bf6 | 微服务接口 - 打印模板分页查询 | 6 years ago | 
				
					
						|  刘辉 | 1defd0d8be | Merge branch 'dev' of i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  wei.peng | cecd37a1e7 | 添加Xml 工具 | 6 years ago | 
				
					
						|  许心洁 | 1d17198daf | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  汪云昊 | ac1c18581e | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  许心洁 | e35cf183da | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  lbwgithub | 81d86d1bd2 | 条码模型 | 6 years ago | 
				
					
						|  许心洁 | 7a403a37da | Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 6 years ago | 
				
					
						|  bleakney.liu | 4409f34e0f | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  汪云昊 | 3ef7d24eab | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  lbwgithub | 9a21e2d99f | 条码差异详情返回值 | 6 years ago | 
				
					
						|  jenkins | 7e3edd06a0 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  汪云昊 | 3b46d242a7 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev  Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 6 years ago | 
				
					
						|  汪云昊 | d830c78d03 | FTP适配器 | 6 years ago |