Merge branch 'master' into test

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml

@@ -36,6 +36,7 @@
             <result column="timeout" property="timeout"/>
             <result column="last_renewal_time" property="lastRenewalTime"/>
             <result column="dsim_create_time" property="createTime"/>
+            <result column="is_test" property="isTest"/>
         </association>
     </resultMap>
 
@@ -43,7 +44,7 @@
         SELECT
         di.*,
         ds.net_state,
-        dsim.id, dsim.type, dsim.activate_time, dsim.timeout, dsim.last_renewal_time, dsim.create_time as dsim_create_time,
+        dsim.id, dsim.type, dsim.activate_time, dsim.timeout, dsim.last_renewal_time, dsim.create_time as dsim_create_time, dsim.is_test,
         dsys.sim_iccid
         FROM
         device_sim dsim