Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev

src/main/java/cn/chnmuseum/party/web/controller/TUserController.java

@@ -132,7 +132,7 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/getUserList", method = RequestMethod.GET)
     @RequiresAuthentication  //@RequiresPermissions("/user/getUserList")
     @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
-    public Map<String, Object> getUserList(String type, String status, String auditStatus) {
+    public Map<String, Object> getUserList(@RequestParam(required = true) String type, String status, String auditStatus) {
         TUser user1 = getcurUser();
         TUser user = new TUser();
         try {