Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-08 01a30369e55a754c28dec4939a99e59aefecdc60

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/VehicleDataMonitor.java

@@ -59,7 +59,7 @@
     * 逻辑删除
     */
    @TableLogic
    private String deleted;
    private Integer deleted;

    public void setId(Integer id) {
        this.id = id;
@@ -117,11 +117,11 @@
        return notUniqueDataNumber;
    }

    public void setDeleted(String deleted) {
    public void setDeleted(Integer deleted) {
        this.deleted = deleted;
    }

    public String getDeleted() {
    public Integer getDeleted() {
        return deleted;
    }