1d55cd22a6 
								
							
								 
							
						 
						
							
							
								
								order by 列类型装换  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								39a00d3a19 
								
							
								 
							
						 
						
							
							
								
								order by 列类型装换  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7eed51791f 
								
							
								 
							
						 
						
							
							
								
								软件适配器-定时适配任务  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f2380f6d14 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								02d60ed1a8 
								
							
								 
							
						 
						
							
							
								
								软件适配器-数据适配转换  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3711873c29 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c34a369e93 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								9d70008912 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								61ce4d1b3f 
								
							
								 
							
						 
						
							
							
								
								优化  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ef1450e912 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-MES/i3plus-mes-pcn  into dev  
							
							... 
							
							
							
							# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6c37a60ff4 
								
							
								 
							
						 
						
							
							
								
								MES-PCN获取平台打印数据  
							
							... 
							
							
							
							Signed-off-by: crish <570360737@qq.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9c596adce 
								
							
								 
							
						 
						
							
							
								
								盘点hql排序修改  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4573b09392 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2058789438 
								
							
								 
							
						 
						
							
							
								
								盘点业务修改bug  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								94924cb264 
								
							
								 
							
						 
						
							
							
								
								POJO  合并  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								718ec36747 
								
							
								 
							
						 
						
							
							
								
								POJO  合并  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								41aff3b560 
								
							
								 
							
						 
						
							
							
								
								``  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								619251474d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f5c0ca9383 
								
							
								 
							
						 
						
							
							
								
								软适配模型调整  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								abf155ecd9 
								
							
								 
							
						 
						
							
							
								
								库存报表 创建人、创建时间添加  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c05e3b13c6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								391d0129e1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								63d86a4b0d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ecba29948f 
								
							
								 
							
						 
						
							
							
								
								816 add method  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								69525fbaa9 
								
							
								 
							
						 
						
							
							
								
								表单菜单排序  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								839c139222 
								
							
								 
							
						 
						
							
							
								
								库存移动条码报表优化  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								638d9cb1a1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9ff9c11c97 
								
							
								 
							
						 
						
							
							
								
								字段调整  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								409c433b5c 
								
							
								 
							
						 
						
							
							
								
								添加字典分组  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								42f067b987 
								
							
								 
							
						 
						
							
							
								
								软适配参数接口  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf5aded9d9 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								05b9298dec 
								
							
								 
							
						 
						
							
							
								
								软适配Repository初始化  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a713e835fd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7455c6c640 
								
							
								 
							
						 
						
							
							
								
								软适配配置文件初始化  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f82011cf5b 
								
							
								 
							
						 
						
							
							
								
								实体  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1c98f0a3c4 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dc78cf114f 
								
							
								 
							
						 
						
							
							
								
								实体  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								46c710e559 
								
							
								 
							
						 
						
							
							
								
								表单功能优化,虚拟属性连表查询,时间格式化对接  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								68e4b74e0a 
								
							
								 
							
						 
						
							
							
								
								平台权限系功能优化  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6d99080069 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								ff52a412d4 
								
							
								 
							
						 
						
							
							
								
								库存初始化信息  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2860edf722 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b604c5d9a0 
								
							
								 
							
						 
						
							
							
								
								交易记录增加字段  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								374c2bf76c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								92d4bf46ce 
								
							
								 
							
						 
						
							
							
								
								#5255,#5039  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								090efb787f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9ee2901346 
								
							
								 
							
						 
						
							
							
								
								添加字典分组  
							
							... 
							
							
							
							优化redis资源键 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d04d441711 
								
							
								 
							
						 
						
							
							
								
								用户管理修改密码 Bug 修复  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0f99cb1027 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								66f49f3fdc 
								
							
								 
							
						 
						
							
							
								
								自定义表单功能调整  
							
							
							
						 
						
							6 years ago