Merge remote-tracking branch 'origin/master'

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -132,6 +132,17 @@
         left join sys_region sr on(info.district_id = sr.id)
         where
         1 = 1
+
+        <if test="queryPage.isBindMerc != null">
+            <choose>
+                <when test="queryPage.isBindMerc == true">
+                    and info.merc_id is not null
+                </when>
+                <otherwise>
+                    and (info.merc_id is null or info.merc_id = '')
+                </otherwise>
+            </choose>
+        </if>
         <if test="queryPage.showStatus != null">
             and info.show_status = #{queryPage.showStatus}
         </if>

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

@@ -140,6 +140,9 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "分页对象", required = true)
         private PageBean page;
 
+        @ApiModelProperty("是否绑定商户")
+        private Boolean isBindMerc;
+
         /**
          * size -1 不分页
          *