diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordPageQry.java index 2bd0697..f5a2566 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordPageQry.java @@ -1,7 +1,6 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,6 +25,7 @@ public class MkmjSwipeCardRecordPageQry extends PageQuery { */ private Integer likeId; private String cardNo; + private String likeDeviceName; private String swingTimeStart; private String swingTimeEnd; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EVehicleArrivalDepartureInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EVehicleArrivalDepartureInfoDO.java index 054b4ec..be2aba6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EVehicleArrivalDepartureInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EVehicleArrivalDepartureInfoDO.java @@ -1,12 +1,9 @@ package com.zcloud.primeport.persistence.dataobject; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** @@ -18,7 +15,6 @@ import lombok.NoArgsConstructor; @Data @TableName("dc_db_2059565538433609728") @NoArgsConstructor -@EqualsAndHashCode(callSuper = true) public class EVehicleArrivalDepartureInfoDO extends BaseDO { //data_version @ApiModelProperty(value = "data_version") @@ -86,8 +82,8 @@ public class EVehicleArrivalDepartureInfoDO extends BaseDO { //vehicle_sequence_number @ApiModelProperty(value = "vehicle_sequence_number") private String vehicleSequenceNumber; - @TableId(type = IdType.ASSIGN_ID) - private Long jjbsaasdatacenterid; +// @TableId(type = IdType.ASSIGN_ID) +// private Long jjbsaasdatacenterid; }