@@ -142,7 +142,7 @@
</if>
<if test="queryPage.no != null and queryPage.no != ''">
and (
- LOCATE(#{queryPage.no}, info.device_id) > 0 or LOCATE(#{queryPage.no}, info.merc_device_code) > 0 or LOCATE(#{queryPage.no}, sysinfo.device_sn) > 0
+ LOCATE(#{queryPage.no}, info.merc_device_code) > 0 or LOCATE(#{queryPage.no}, sysinfo.device_sn) > 0or LOCATE(#{queryPage.no}, sysinfo.sim_iccid) > 0
)
<if test="queryPage.activeState != null">
@@ -48,7 +48,7 @@ public class DeviceInfoDto {
@ApiModelProperty(value = "分页对象", required = true)
private PageBean page;
- @ApiModelProperty("机器/资产/sn/sim号")
+ @ApiModelProperty("资产/sn/sim号")
private String no;
@ApiModelProperty("商户id/商户号/商户名称")