V1.1.7.5

e95d5082 · 张永 · 221f4342 · e95d5082 · e95d5082
Commit e95d5082 authored Mar 18, 2024 by 张永
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

UserServiceImpl.java ...java/com/egolm/shop/api/service/impl/UserServiceImpl.java +3 -0

redmine.html src/main/resources/templates/redmine.html +2 -2

No files found.
--- a/src/main/java/com/egolm/shop/api/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/egolm/shop/api/service/impl/UserServiceImpl.java
@@ -880,6 +880,8 @@ public class UserServiceImpl implements UserService {
 				throw new XException("该账号暂未绑定门店");
 			}
 			List<Map<String, Object>> payServiceList = datas.get(4);
+			
+			List<Map<String, Object>> shopAgentList = datas.get(5);
 			 
 			Map<String, Object> custMap = datas.get(1).get(0);
 			custMap.put("sOpenID", openId);
@@ -888,6 +890,7 @@ public class UserServiceImpl implements UserService {
 			map.put("bankList", datas.get(2));
 			map.put("shopList", shopList);
 			map.put("payServiceList", payServiceList);
+			map.put("shopAgentList", shopAgentList);
 			return map;
 		}
 	}

--- a/src/main/resources/templates/redmine.html
+++ b/src/main/resources/templates/redmine.html
@@ -24,9 +24,9 @@
 </head>
 <body>
 	<div id="app">
-	     <el-divider content-position="left">V1.1.7.5 2024-3-14</el-divider>
+	     <el-divider content-position="left">V1.1.7.5 2024-3-18</el-divider>
 		 <p class="title">1.增加接口签名验证及开关</p> 
-		 <p class="title">2.需求 #16555</p> 
+		 <p class="title">2.需求 #16555、需求 #16563</p> 
 		 <el-divider content-position="left">V1.1.7.4 2024-3-1</el-divider>
 		 <p class="title">1.将日志写入SqlServer LGODB的idcSystemLog,一月一表: idcSystemLog_yyyyMM</p> 
 		 <p class="title">2.读写分离拆分 需求 #16467</p>