Commit 4e3e421296c3f5bf5123aac7d879e05499d99c17

Authored by zq
2 parents e24f4649 97a2b57e

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control.git into minhang

src/main/java/com/bsth/entity/Cars.java
... ... @@ -57,7 +57,7 @@ public class Cars implements Serializable {
57 57 /** 设备终端号 */
58 58 @Column(nullable = false)
59 59 private String equipmentCode;
60   -
  60 +
61 61 // 以下信息来自总公司的业务系统,可能需要调用相关接口
62 62 /** 车型类别 */
63 63 private String carClass ;
... ... @@ -115,6 +115,8 @@ public class Cars implements Serializable {
115 115 private String vehicleStats;
116 116 /** 营运状态 */
117 117 private String operatorsState;
  118 + /** 营运证编码 */
  119 + private String serviceNo;
118 120 /** 是否电车(TODO:在原系统里没有,这里暂时留着) */
119 121 private Boolean sfdc;
120 122 /** 备注/描述 */
... ... @@ -148,8 +150,16 @@ public class Cars implements Serializable {
148 150 /** 修改日期 */
149 151 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
150 152 private Date updateDate;
  153 +
  154 + public String getServiceNo() {
  155 + return serviceNo;
  156 + }
  157 +
  158 + public void setServiceNo(String serviceNo) {
  159 + this.serviceNo = serviceNo;
  160 + }
151 161  
152   - public Integer getId() {
  162 + public Integer getId() {
153 163 return id;
154 164 }
155 165  
... ...