Compare commits
No commits in common. "d509a8d31e28e0137094335acaeaa3ba71dae0d9" and "3c33812401201ed351411485f83941c626ec367f" have entirely different histories.
d509a8d31e
...
3c33812401
|
|
@ -13,7 +13,6 @@ import lombok.experimental.Accessors;
|
|||
import javax.validation.constraints.*;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -237,11 +236,4 @@ public class DevInfo extends BaseEntity {
|
|||
@ApiModelProperty(value = "上传人id")
|
||||
private Long ownId;
|
||||
|
||||
@ApiModelProperty(value = "校验日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date checkDate;
|
||||
|
||||
@ApiModelProperty(value = "校验周期")
|
||||
private Integer checkCycle;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -296,8 +296,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="isActive != null and isActive != ''">is_active,</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by,</if>
|
||||
<if test="ownId != null">own_id,</if>
|
||||
<if test="checkDate != null">check_date,</if>
|
||||
<if test="checkCycle != null">check_cycle,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
|
||||
|
|
@ -334,8 +332,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="isActive != null and isActive != ''">#{isActive},</if>
|
||||
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
||||
<if test="ownId != null">#{ownId},</if>
|
||||
<if test="checkDate != null">#{checkDate},</if>
|
||||
<if test="checkCycle != null">#{checkCycle},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue