Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java

@@ -288,7 +288,7 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
             List<Long> idList = ListUtil.toList(ids);
             List<SConsumer> list = baseMapper.selectBatchIds(idList);
             //解除所有门店关联
-            storeConsumerMapper.deleteBatchIds(idList);
+            storeConsumerMapper.delete(new LambdaQueryWrapper<SStoreConsumer>().in(SStoreConsumer::getConsumerId, idList));
             list.stream().forEach(sConsumer -> {
                 sConsumer.setRoleType(RoleTypeEnum.MEMBRO.getCode());
             });

share-system/src/main/resources/mapper/system/DeviceMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                voltage, signal_value, room_id from s_device
     </sql>
 
-    <select id="selectDeviceList" parameterType="Device" resultMap="DeviceResult">
+    <select id="selectDeviceList" parameterType="DeviceDto" resultMap="DeviceResult">
         select
         t1.id,
         t1.dev_name,