|
|
|
@@ -4,12 +4,10 @@ import cn.afterturn.easypoi.excel.annotation.Excel; |
|
|
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; |
|
|
|
import lombok.Data; |
|
|
|
import lombok.EqualsAndHashCode; |
|
|
|
import lombok.ToString; |
|
|
|
|
|
|
|
import javax.persistence.Id; |
|
|
|
import javax.persistence.Table; |
|
|
|
import javax.persistence.Transient; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
@@ -86,9 +84,11 @@ public class KwMeter extends BaseEntity { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "波特率(1200,2400,9600)", name = "bandrate") |
|
|
|
private Integer bandrate; |
|
|
|
|
|
|
|
@Transient |
|
|
|
@Excel(name = "商户", width = 20, orderNum = "8") |
|
|
|
private String merchantName; |
|
|
|
|
|
|
|
@Transient |
|
|
|
private Long merchantId; |
|
|
|
|
|
|
|
@Transient |
|
|
|
|