Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http

@@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName
 Content-Type: application/json
 
 {
-  "areaCode": "510900000000"
+  "areaCode": "513232000000"
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -6,7 +6,7 @@
     "baseUrl": "http://192.168.0.60:17211/base"
   },
   "base-test": {
-    "baseUrl": "http://192.168.0.98:11078/base"
+    "baseUrl": "http://192.168.0.124:11078/base"
   },
 
   "base-test-https": {
@@ -18,14 +18,7 @@
   },
 
   "base-test1": {
-    "baseUrl": "http://8.136.255.30:11078/base"
-  },
-  "base-yibintest": {
-    "baseUrl": "http://192.168.2.169:11078/base"
-  },
-
-  "base-yibin": {
-    "baseUrl": "http://10.12.185.213:11078/base"
+    "baseUrl": "http://8.136.255.30:21026/base"
   },
 
   "base-yibin-web": {

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -115,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":22
+  "id":21
 }
 
 

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

@@ -92,7 +92,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         }
     }
 
-    @Override
+   /* @Override
     @UnAuth
     public Rest<Object> list(@RequestBody UserEntity query) {
         Map<String, Object> model = new HashMap();
@@ -121,7 +121,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         ret.setDict(model.get(KEY_RESULT_DICT));
         ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
         return ret;
-    }
+    }*/
 
     /* @Override
     public String list(@RequestBody(required = false) UserEntity query) {