Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java

@@ -193,7 +193,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
         if (null != deviceId && !deviceId.isEmpty()) {
             log.info("[RES] getPatrolResultValue deviceId: {}", deviceId);
             PatrolResultDefaultValue patrolResultDefaultvalue = new PatrolResultDefaultValue();
-            patrolResultDefaultvalue.setPatrolPointId(Long.valueOf(deviceId));
+            patrolResultDefaultvalue.setPatrolPointId(deviceId);
             List<PatrolResultDefaultValue> list = patrolResultDefaultvalueMapper.selectPatrolResultDefaultValueList(patrolResultDefaultvalue);
             PatrolResultDefaultValue patrolResultDefaultvalueResult = null;
             if (null != list && !list.isEmpty()) {

inspect-main/inspect-main-task/src/main/java/com/inspect/patrolresultdefault/domain/PatrolResultDefaultValue.java

@@ -13,7 +13,7 @@ public class PatrolResultDefaultValue extends BaseEntity {
     @Excel(
             name = "巡检点id"
     )
-    private Long patrolPointId;
+    private String patrolPointId;
     @Excel(
             name = "值默认值"
     )