Merge branch 'SIM卡' into test

device-api/src/main/java/com/xy/dto/SimInfoDto.java

@@ -19,6 +19,13 @@ public class SimInfoDto {
 
         @ApiModelProperty(value = "运营商")
         private String isp;
+
+        public String getIccid() {
+            if (iccid.length() > 20) {
+                iccid = iccid.substring(0, 20);
+            }
+            return iccid;
+        }
     }
 
     @Data

device-start/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ cloud:
   center:
     url: 119.96.213.127:9007
     config:
-      shared-configs: redis.yaml,mysql.yaml,xxl-job.yaml,algorithm.yaml,xy-oss.yaml,alipay.yaml,cloudwalk.yaml,magic-api.yaml,knife4j.yaml,tyai.yaml
+      shared-configs: redis.yaml,mysql.yaml,xxl-job.yaml,algorithm.yaml,xy-oss.yaml,alipay.yaml,cloudwalk.yaml,magic-api.yaml,knife4j.yaml,tyai.yaml,sim-api.yaml
       name: device
   service:
     name: dev-device