x_z
							
						 | 
						
							
							
							
							
								
							
								098ada84c9
								
							
								
							
						 | 
						
							
							
								
								1.提交设备巡检,维保等接口代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								71a1dbd019
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								fe27449cb7
								
							
								
							
						 | 
						
							
							
								
								单据复制功能,中继服务相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								beb5b55fd4
								
							
								
							
						 | 
						
							
							
								
								打包
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								106909d8be
								
							
								
							
						 | 
						
							
							
								
								修改耗材领用bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5a48483845
								
							
								
							
						 | 
						
							
							
								
								单据复制功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								44fa2c252e
								
							
								
							
						 | 
						
							
							
								
								单据复制功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f06dc47afb
								
							
								
							
						 | 
						
							
							
								
								1.提交设备巡检计划相关代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9d42a60f66
								
							
								
							
						 | 
						
							
							
								
								多级产品页面代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								37b4be08b2
								
							
								
							
						 | 
						
							
							
								
								1.修改设备领用逻辑,审核通过后添加到部门设备明细
							
							
							
							
							
							
							
							2.添加保修单,科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								89e4cd3661
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3651b54080
								
							
								
							
						 | 
						
							
							
								
								多级产品页面代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ff9fd56cc0
								
							
								
							
						 | 
						
							
							
								
								业务单据流转相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b2779284f0
								
							
								
							
						 | 
						
							
							
								
								bug相关修改,业务单据修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a89aba0977
								
							
								
							
						 | 
						
							
							
								
								多级产品页面代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9d5da74e33
								
							
								
							
						 | 
						
							
							
								
								计划单据根据单据生成功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4bed6fcddc
								
							
								
							
						 | 
						
							
							
								
								申购单据根据单据生成功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								8907c32a99
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d123b0824c
								
							
								
							
						 | 
						
							
							
								
								耗材字典根据单据生成功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3495384ef5
								
							
								
							
						 | 
						
							
							
								
								新增数据同步代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2f48a29839
								
							
								
							
						 | 
						
							
							
								
								1.初步完成出入库汇总逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c1cfccbf87
								
							
								
							
						 | 
						
							
							
								
								同步代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0b746a5a09
								
							
								
							
						 | 
						
							
							
								
								单据流程相关迁移到UDI管理系统
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								aca8b1b682
								
							
								
							
						 | 
						
							
							
								
								1.添加查询汇总记录详情接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9a9b292495
								
							
								
							
						 | 
						
							
							
								
								1.提交查询汇总记录列表接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								18d17933be
								
							
								
							
						 | 
						
							
							
								
								1.完善汇总出入库数据逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f667a13279
								
							
								
							
						 | 
						
							
							
								
								计划查询代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7ccb108d02
								
							
								
							
						 | 
						
							
							
								
								计划查询代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								92750942b1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								6a20c521f8
								
							
								
							
						 | 
						
							
							
								
								申购查询代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9868ebd8d0
								
							
								
							
						 | 
						
							
							
								
								1.添加生成单日出入库汇总数据逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								803f01c965
								
							
								
							
						 | 
						
							
							
								
								首营资质打印bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								340073ea81
								
							
								
							
						 | 
						
							
							
								
								1.添加物资出入库汇总数据生成代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3dd30519db
								
							
								
							
						 | 
						
							
							
								
								产品申购添加领用单引入
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								176f808bca
								
							
								
							
						 | 
						
							
							
								
								产品申购添加领用单引入
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ac1839b825
								
							
								
							
						 | 
						
							
							
								
								耗材字典维护编辑添加院内分类
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								261c0154be
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f8a7c55c09
								
							
								
							
						 | 
						
							
							
								
								单据相关bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								770405f62a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a1c70d91dc
								
							
								
							
						 | 
						
							
							
								
								同步自助代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								949c4074f5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								ab39ecfcad
								
							
								
							
						 | 
						
							
							
								
								1.关闭jmx,修复测试环境下tomcat多服务无法成功启动问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4d4b3fe84e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0ea2a67d5b
								
							
								
							
						 | 
						
							
							
								
								打印相关问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								44941fb089
								
							
								
							
						 | 
						
							
							
								
								1.完善资质预警代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3fd70cfdec
								
							
								
							
						 | 
						
							
							
								
								自助平台同步bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								501454a868
								
							
								
							
						 | 
						
							
							
								
								1.添加资质预警相关代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a50c53339d
								
							
								
							
						 | 
						
							
							
								
								修改产品资质bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3f9968e9a3
								
							
								
							
						 | 
						
							
							
								
								产品添加预警设置
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								09b677c408
								
							
								
							
						 | 
						
							
							
								
								修改仓库bug
							
							
							
							
							
						 | 
						
							3 years ago |