Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

 dao/src/main/java/com/sandu/ximon/dao/domain/C3mChargingCharge.java

@@ -50,20 +50,8 @@
    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

    @TableField(exist = false)
    private static final Double DEFAULT_CHARGE = 8.8;

    public C3mChargingCharge(){}

    public C3mChargingCharge(Integer c3Id,Integer hour,Integer min, Double charge,Long timestamp){
        this.c3Id = c3Id;
        this.hour = hour;
        this.min = min;
        this.charge = charge;
        this.timestamp = timestamp;
    }


    public static C3mChargingCharge getInitInstance(Integer c3Id) {
        return new C3mChargingCharge(c3Id,0,0, DEFAULT_CHARGE, new Date().getTime());
    }
}