Merge remote-tracking branch 'origin/master' into dev

#20230529 欣影管理平台拍照时间表代码
2 changed files with 1 additions and 7 deletions
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java
@ -9,12 +9,6 @@ import lombok.Data;
@ApiModel(value = "查询GPS对象", description = "查询GPS对象描述")
 public class TerminalGpsVo {

-    @ApiModelProperty(value = "装置编号", example = "123455")
-    private Integer termid;
-
-    @ApiModelProperty(value = "查询时间", example = "123455")
-    private DateTime queryTime;
-
    @ApiModelProperty(value = "装置ID", example = "123455")
    private String cmdId;
 }
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java
@ -120,8 +120,8 @@ public class TerminalGpsServiceImpl implements TerminalGpsService {
            model.setUpdatetime(MyDateUtils.date(updatetime.longValue()));
            BigInteger queryTime = MyDateUtils.TimeMillSecond2Second(vo.getQueryTime());
            hasNew = updatetime.compareTo(queryTime) < 0 ? false : true;
-            model.setHasNew(hasNew);
        }
+        model.setHasNew(hasNew);
        if (null!=model) {
            return Asserts.success(model);
        } else {
Author	SHA1	Message	Date
18616268358	b79ea32ea3	Merge remote-tracking branch 'origin/master' into dev	2 years ago
18616268358	7bf1c055e4	#20230529 欣影管理平台拍照时间表代码	2 years ago
18616268358	9594457ffb	#20230529 欣影管理平台拍照时间表代码	2 years ago