Merge remote-tracking branch 'origin/developerA' into developerA

src/main/webapp/WEB-INF/views/modules/user/cmUserList.jsp

@@ -120,7 +120,6 @@
         <th>用户类型</th>
         <th>注册时间</th>
         <th>用户状态</th>
-        <th>邀请人名称</th>
         <shiro:hasPermission name="user:cmUser:edit">
             <th>操作</th>
         </shiro:hasPermission>
@@ -168,9 +167,6 @@
                     </a>
                 </c:if>
             </td>
-            <td>
-                    ${cmUser.fromUserName}
-            </td>
             <td>
                 <a href="${ctx}/user/cmUser/info?id=${cmUser.userID}">查看</a>
                 <shiro:hasPermission name="user:cmUser:edit">