Merge remote-tracking branch 'origin/master'

This commit is contained in:
yuyang 2021-09-23 09:57:09 +08:00
commit 8d5105b28d

View File

@ -172,8 +172,6 @@ public class XhpcHistoryOrder extends BaseEntity {
*/
private Double totalPower;
private String gunId;
private Date startTime;
/**
@ -561,16 +559,6 @@ public class XhpcHistoryOrder extends BaseEntity {
this.totalPower = totalPower;
}
public String getGunId() {
return gunId;
}
public void setGunId(String gunId) {
this.gunId = gunId;
}
public Date getStartTime() {
return startTime;