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

base-manager/pom.xml

@@ -191,6 +191,12 @@
             <version>0.4.5</version>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+
 
         <dependency>
             <groupId>junit</groupId>

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

@@ -4,9 +4,10 @@ POST {{baseUrl}}/skin/field/list
 Content-Type: application/json
 
 {
-    "page":1,
-    "size":10,
-    "skinId": 0
+  "page": 1,
+  "size": 10,
+  "skinId": 0,
+  "templateId": 18
 }
 
 
@@ -16,17 +17,17 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "skinId":116,
-        "templateId":815,
-        "fieldCode":"jgcw4o",
-        "fieldName":"oc7yyf",
-        "fieldType":"sgykcs",
-        "fieldValue":"09epx1",
-        "fieldLen":100,
-        "fieldNull":1,
-        "fieldOrderNo":"ii8ch4",
-        "remark":"v92dun",
-        "enabled":1,
+  "skinId": 116,
+  "templateId": 815,
+  "fieldCode": "jgcw4o",
+  "fieldName": "oc7yyf",
+  "fieldType": "sgykcs",
+  "fieldValue": "09epx1",
+  "fieldLen": 100,
+  "fieldNull": 1,
+  "fieldOrderNo": "ii8ch4",
+  "remark": "v92dun",
+  "enabled": 1
 }
 
 > {%

pom.xml

@@ -53,6 +53,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>