Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/tugou/tugou.js

@@ -262,6 +262,11 @@ define(function (require) {
                       title: '单价',
                     },
                     {
+                      field: 'tgItemNum',
+                      title: '单人限额',
+                      align:'left',
+                    },
+                    {
                       field: 'tgMinNum',
                       title: '最低配送(份)',
                       align: 'left',

whepi-ui/templates/user/changeRole.ftl

@@ -13,7 +13,7 @@
                         <br/>
                         <br/>
                         <br/>
-                        <h1 class="user-title">家园抗击疫情公共服务平台</h1>
+                        <h1 class="user-title">家园互助平台</h1>
                         <br/>
                         <h1 class="user-title"><#if uptown_name ??>${uptown_name!''}</#if></h1>
                         <br/>

whepi-ui/templates/user/home.ftl

@@ -9,7 +9,7 @@
                     <header class="user-header">
                         <br/>
                         <br/>
-                        <h1 class="user-title">家园抗击疫情公共服务平台</h1>
+                        <h1 class="user-title">家园互助平台</h1>
                         <br/>
                         <h1 class="user-title">用户登录</h1>
                     </header>

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -65,10 +65,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-//            UserOpen userOpen = homeService.getUserOpen();
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.select ByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");