|  x_z | 13034f5803 | Merge remote-tracking branch 'origin/master' # Conflicts:
#	api-udims/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java
#	api-udims/src/main/java/com/glxp/udi/admin/controller/inout/BusRoleRlController.java
#	api-udims/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java
#	api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderMdEntity.java
#	api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java
#	api-udims/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java
#	api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/PlatformServiceImpl.java
#	api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java
#	api-udims/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml | 4 years ago | 
				
					
						|  anthonyywj2 | 8a03e70898 | 单据类型,关联自助平台 | 4 years ago | 
				
					
						|  MrZhai | e657e99094 | 1.删除公司信息里总部信息字段 2.客户状态移除未验证状态值及相关字段校验 | 4 years ago | 
				
					
						|  MrZhai | 5c92c1e6a7 | 1.对接中转服务数据,修复用户注册bug | 4 years ago | 
				
					
						|  MrZhai | ad26d47aa2 | 1.重构项目,合并系统管理功能代码 | 4 years ago | 
				
					
						|  cqf | b96388c5fc | 删除okhttp3 | 4 years ago | 
				
					
						|  cqf | 42c494c18a | 关联平台验证 | 4 years ago | 
				
					
						|  cqf | eb62122722 | 平台验证 | 4 years ago | 
				
					
						|  cqf | 1f6448efdf | 关联平台验证 | 4 years ago | 
				
					
						|  cqf | c5fafd58da | 修改updateUnit | 4 years ago | 
				
					
						|  cqf | 63b76cc04c | 增加平台key信息 | 4 years ago | 
				
					
						|  cqf | b6ef873964 | 增加关联平台验证 | 4 years ago | 
				
					
						|  cqf | e9a07bd3d2 | update scripts/vue-admin.sql. | 4 years ago | 
				
					
						|  cqf | a8472d0f49 | update scripts/vue-admin.sql. | 4 years ago | 
				
					
						|  cqf | a00668fc6f | update scripts/vue-admin.sql. | 4 years ago | 
				
					
						|  cqf | 2696542f02 | update scripts/vue-admin.sql. IO_UNIT_MAINTAIN增加平台授权信息 | 4 years ago | 
				
					
						|  chenqf | b5bb85364c | Merge branch 'master' of https://gitee.com/anthonywj/udims-java | 4 years ago | 
				
					
						|  chenqf | 63fd0b75a8 | SQL | 4 years ago | 
				
					
						|  chenqf | 75bff465a9 | SQL | 4 years ago | 
				
					
						|  chenqf | ad670388e2 | Merge branch 'master' of https://gitee.com/anthonywj/udims-java | 4 years ago | 
				
					
						|  chenqf | c9ea3b470e | 增加平台列表 | 4 years ago | 
				
					
						|  hongtianzai | 2da2b7023d | 角色授权接口中转 | 4 years ago | 
				
					
						|  hongtianzai | 0f5eaba22b | Merge branch 'master' of https://gitee.com/anthonywj/udims-java into udims_mango | 4 years ago | 
				
					
						|  hongtianzai | 3ce8fc526d | 权限相关 | 4 years ago | 
				
					
						|  anthonywj | 7718543a43 | UDI流向查询 | 4 years ago | 
				
					
						|  anthonywj | 5a97811af0 | udims代码备份 | 4 years ago | 
				
					
						|  hongtianzai | 00160d2a5d | 阳光采购平台修改 | 4 years ago | 
				
					
						|  hongtianzai | b92bf62fd8 | 阳光平台对照主键修改 | 4 years ago | 
				
					
						|  hongtianzai | 9256d9e507 | 阳光采购平台数据同步 | 4 years ago | 
				
					
						|  hongtianzai | fa41927310 | 阳光对照相关接口中转 | 4 years ago | 
				
					
						|  hongtianzai | 2e7759dbd9 | api转发修改 | 4 years ago | 
				
					
						|  hongtianzai | 62db8aea20 | api跳转国家同步库 | 4 years ago | 
				
					
						|  hongtianzai | 6c1c70d004 | Merge branch 'udims_mango' of https://gitee.com/anthonywj/udims-java into udims_mango  Conflicts:
	api-common/target/classes/com/glxp/udi/common/constant/CacheConstant.class
	api-common/target/classes/com/glxp/udi/common/converter/LongList2StringConverter.class
	api-common/target/classes/com/glxp/udi/common/converter/String2LongListConverter.class
	api-common/target/classes/com/glxp/udi/common/converter/String2StringListConverter.class
	api-common/target/classes/com/glxp/udi/common/enums/ResultEnum.class
	api-common/target/classes/com/glxp/udi/common/req/BaseLimitRequest.class
	api-common/target/classes/com/glxp/udi/common/req/BaseRequest.class
	api-common/target/classes/com/glxp/udi/common/res/BaseResponse.class
	api-common/target/classes/com/glxp/udi/common/util/ResultVOUtils.class
	api-common/target/test-classes/com/glxp/udi/common/util/ResultVOUtilsTest.class
	api-udims/src/main/resources/application-pro.properties | 4 years ago | 
				
					
						|  anthonywj | 49fb1819de | udims代码备份 | 4 years ago | 
				
					
						|  anthonywj | 07cae1f471 | 删除多余文件 | 4 years ago | 
				
					
						|  anthonywj | bd74c92586 | 删除多余文件 | 4 years ago | 
				
					
						|  anthonywj | b29007ff08 | 删除多余文件 | 4 years ago | 
				
					
						|  anthonywj | 5994066331 | 新增库存查询管理 | 4 years ago | 
				
					
						|  anthonywj | a202be5419 | 出入库替换成mongodb,beta | 4 years ago | 
				
					
						|  anthonywj | 03fceaf8d9 | 1.提交国家库参数错误;2.完善出入库 | 4 years ago | 
				
					
						|  anthonywj | 40c7ca13ce | 器械类别上传错误等bug修复 | 5 years ago | 
				
					
						|  anthonywj | 75545dba03 | UDIbeta版 | 5 years ago | 
				
					
						|  anthonywj | 645211f788 | 代码备份 | 5 years ago | 
				
					
						|  anthonywj | 11ed144b8d | first commit | 5 years ago |