Merge remote-tracking branch 'origin/release-201845-wangcz' into release-201845-wangcz

src/main/webapp/resources/view/sso/staffManagement.html

@@ -940,7 +940,7 @@
                              全选</th>-->
                         <!--<th width="143">UU账号</th>-->
                         <th width="101">姓名</th>
-                        <th width="67">性别</th>
+                        <!--<th width="67">性别</th>-->
                         <th width="133">手机</th>
                         <th width="207">邮箱</th>
                         <th width="188">商城角色</th>
@@ -960,12 +960,12 @@
                         <td>
                             <input type="text" ng-model="newUser.userName" required placeholder="用户名">
                         </td>
-                        <td>
-                            <select ng-model="newUser.userSex" ng-init="newUser.userSex='M'" >
-                                <option value="M">男</option>
-                                <option value="F">女</option>
-                            </select>
-                        </td>
+                        <!--<td>-->
+                            <!--<select ng-model="newUser.userSex" ng-init="newUser.userSex='M'" >-->
+                                <!--<option value="M">男</option>-->
+                                <!--<option value="F">女</option>-->
+                            <!--</select>-->
+                        <!--</td>-->
                         <td ng-class="{'has-error': userTelError, 'has-success': userTelSuccess}">
                             <input ng-model="newUser.userTel"
                                    ng-blur="telValid(newUser.userTel)" required name="newUserTel"
@@ -980,6 +980,9 @@
                         <td class="role-tag-area">
                             <span class="role-tag bgcolor-5">普</span>
                         </td>
+                        <td class="role-tag-area">
+                            <!--<span class="role-tag bgcolor-5">普</span>-->
+                        </td>
                         <td class="submit-area">
                             <span ng-click="setAddingUser(false)" >取消</span>
                             <span ng-click="addUser(newUser)">确定</span>
@@ -994,7 +997,7 @@
                          </td>-->
                         <!--<td>{{user.userUU}}</td>-->
                         <td>{{user.userName}}</td>
-                        <td>{{user.userSex != null ? (user.userSex == 'M' || user.userSex == '男' ? '男' : '女') : '-'}}</td>
+                        <!--<td>{{user.userSex != null ? (user.userSex == 'M' || user.userSex == '男' ? '男' : '女') : '-'}}</td>-->
                         <td>{{user.userTel}}</td>
                         <td>{{user.userEmail}}</td>
                         <td class="role-tag-area detail-role-tag">