Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceQualityInspectionPlanService.java

@@ -307,7 +307,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
//        List<IotDeviceQualityInspectionPlanDO> listOrderNo = iotDeviceQualityInspectionPlanDao.findByOrderNo(orderNo);
        StringBuffer sql = new StringBuffer("SELECT c.* FROM  iot_device_quality_inspection_plan c WHERE del=1");
        sql.append(" and c.order_no = ").append(orderNo);
        sql.append(sql).append("  ORDER BY c.plan_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
        sql.append("  ORDER BY c.plan_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
        List<IotDeviceQualityInspectionPlanDO> listOrderNo = jdbcTempalte.query(sql.toString(),new BeanPropertyRowMapper(IotDeviceQualityInspectionPlanDO.class));
        List<IotDeviceQualityInspectionPlanVO> list = transforList(listOrderNo);