|  x_z | cfcdc1a2da | 1.修复盘点生成单据的bug | 3 years ago | 
				
					
						|  x_z | b3057f8a1e | 1.修复管理员账号分库查询无数据的问题 | 3 years ago | 
				
					
						|  x_z | 4585ed9dda | 1.合并盘点功能,解决代码合并冲突 | 3 years ago | 
				
					
						|  x_z | 3012af591f | Merge remote-tracking branch 'origin/zhairh' into busUser # Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java | 3 years ago | 
				
					
						|  x_z | 1989fb27e5 | Merge remote-tracking branch 'origin/busUser' into zhairh # Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java | 3 years ago | 
				
					
						|  x_z | c56ed7d5b0 | Merge remote-tracking branch 'origin/zhairh' into zhairh | 3 years ago | 
				
					
						|  x_z | a02846b562 | 1.修复盘点转单bug | 3 years ago | 
				
					
						|  anthonyywj2 | a5147bd4f7 | 同步设置报错问题 | 3 years ago | 
				
					
						|  anthonyywj2 | affd380b00 | 同步设置报错问题 | 3 years ago | 
				
					
						|  anthonyywj2 | 6c071984c4 | Merge remote-tracking branch 'origin/zhairh' into zhairh | 3 years ago | 
				
					
						|  zhengmingliang | 7e185e74d8 | 同步自助平台代码 | 3 years ago | 
				
					
						|  x_z | d84b4ff437 | 1.修复盘点bug | 3 years ago | 
				
					
						|  anthonyywj2 | 324cb6569c | 同步设置报错问题 | 3 years ago | 
				
					
						|  anthonyywj2 | d08464a4c6 | 备份 | 3 years ago | 
				
					
						|  x_z | 76166a9628 | 1.盘点码详情添加批次号字段 2.修复盘点的bug | 3 years ago | 
				
					
						|  x_z | 9f8e17dec0 | Merge remote-tracking branch 'origin/busUser' into zhairh # Conflicts:
#	api-admin/src/main/resources/application-dev.properties | 3 years ago | 
				
					
						|  x_z | 0f61a6bdd9 | 1.提交手持终端保存单据接口 | 3 years ago | 
				
					
						|  x_z | fff7f81125 | 1.盘点单据查询接口添加盘点单号参数 2.添加手持终端提交盘点单据接口 | 3 years ago | 
				
					
						|  anthonyywj2 | 08ca7b0463 | bug修改 | 3 years ago | 
				
					
						|  x_z | c6e4b922da | 1.提交代码 | 3 years ago | 
				
					
						|  x_z | 42e7953ddb | Merge remote-tracking branch 'origin/zhairh' into zhairh # Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java
#	api-admin/src/main/resources/application-dev.properties
#	api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 3 years ago | 
				
					
						|  x_z | 6b88b3f244 | 1.修复盘点功能bug | 3 years ago | 
				
					
						|  x_z | d0aa8e9412 | Merge branch 'busUser' into zhairh # Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java
#	api-admin/src/main/resources/application-dev.properties
#	api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 3 years ago | 
				
					
						|  x_z | 852377e620 | 保存配置文件 | 3 years ago | 
				
					
						|  anthonyywj2 | 2e7aedb192 | 首营资质同步 | 3 years ago | 
				
					
						|  x_z | 08d7c5abd1 | Merge remote-tracking branch 'origin/busUser' into zhairh # Conflicts:
#	api-admin/src/main/resources/application-dev.properties | 3 years ago | 
				
					
						|  x_z | e7bbe483c7 | 保存配置文件 | 3 years ago | 
				
					
						|  anthonyywj2 | 3d7ae9f730 | 首营资质同步 | 3 years ago | 
				
					
						|  x_z | b0090a3b51 | Merge remote-tracking branch 'origin/busUser' into zhairh # Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java
#	api-admin/src/main/resources/application-dev.properties
#	api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 3 years ago | 
				
					
						|  x_z | bf6ca801db | Merge remote-tracking branch 'origin/busUser' into busUser | 3 years ago | 
				
					
						|  x_z | 26392dcbd7 | 1.添加上传单据到自助平台接口 2.往来单位类型添加医院客户类型 | 3 years ago | 
				
					
						|  anthonyywj2 | 37dfdc87a3 | 自助平台代码同步 | 3 years ago | 
				
					
						|  x_z | b9b19c6808 | 1.迁移医院客户功能代码,解决报错问题 | 3 years ago | 
				
					
						|  x_z | 3e4cf0c316 | 1.保存代码 | 3 years ago | 
				
					
						|  anthonyywj2 | f7e8306ba7 | Merge branch 'busUser' into purchase | 3 years ago | 
				
					
						|  anthonyywj2 | fecae19d57 | 采购管理bug修改 | 3 years ago | 
				
					
						|  anthonyywj2 | 29e93d9a6c | 单据领用校验问题 | 3 years ago | 
				
					
						|  anthonyywj2 | 34f975c5a1 | 首映功能完善,领用功能完善,采购管理完善 | 3 years ago | 
				
					
						|  x_z | 8bb068e2f5 | 1.修复盘点部分bug | 3 years ago | 
				
					
						|  x_z | 430cba26d6 | 1.查询货位列表添加状态条件 | 3 years ago | 
				
					
						|  x_z | 6f40183f82 | 1.修复盘点功能部分bug | 3 years ago | 
				
					
						|  x_z | 954b6bb5d1 | 1.修复统计盘点设置查询错误问题 | 3 years ago | 
				
					
						|  x_z | e0b1b1839b | Merge remote-tracking branch 'origin/busUser' into zhairh | 3 years ago | 
				
					
						|  x_z | 7cab2bc510 | 1.修改盘点逻辑,适配多种盘点类型 | 3 years ago | 
				
					
						|  x_z | c83ed9c741 | 1.盘点单据添加盘点类型字段 2.增加盘点单据页面库存查询接口 | 3 years ago | 
				
					
						|  x_z | 8db9405557 | 1.修改盘点单据表 | 3 years ago | 
				
					
						|  x_z | 33e8645c7a | 1.完善生成盘盈盘亏单据逻辑 | 3 years ago | 
				
					
						|  x_z | ee7754df7c | 1.修改生成盘点入库单逻辑 | 3 years ago | 
				
					
						|  x_z | 6ee07ea460 | 1.保存代码 | 3 years ago | 
				
					
						|  x_z | 7459c2ff43 | 1.添加盘点设置表及对应增改查接口和实体类 | 3 years ago |