Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

youxiw2000
2 parents 1d38768e 14d341fb
Showing 2 changed files with 47 additions and 0 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
@@ -222,6 +222,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         loginUser.setToken(token);
         tokenService.refreshToken(loginUser);
         vo.setToken(token);
+        vo.setName(nUser.getGarUserName());
         GarUserReq userReq = reqGarUser(loginDto.getTel());
 package com.trash.enterprise.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.trash.common.annotation.Excel;
 import com.trash.common.core.domain.BaseEntity;
@@ -8,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 /**
  * 运输企业管理对象 transportation_enterprise
@@ -145,6 +147,18 @@ public class TransportationEnterprise extends BaseEntity
     private String userType;
+    @TableField(exist = false)
+    private String corporation;
+
+    @TableField(exist = false)
+    private String safetyOfficer;
+
+    @TableField(exist = false)
+    private String entryTime;
+
+    @TableField(exist = false)
+    private List<String> licensePlateNos;
+
     public String getCompanyLogo() {
         return companyLogo;
@@ -486,4 +500,36 @@ public class TransportationEnterprise extends BaseEntity
             .append("qrCode", getQrCode())
             .toString();
     }
+
+    public String getCorporation() {
+        return corporation;
+    }
+
+    public void setCorporation(String corporation) {
+        this.corporation = corporation;
+    }
+
+    public String getSafetyOfficer() {
+        return safetyOfficer;
+    }
+
+    public void setSafetyOfficer(String safetyOfficer) {
+        this.safetyOfficer = safetyOfficer;
+    }
+
+    public String getEntryTime() {
+        return entryTime;
+    }
+
+    public void setEntryTime(String entryTime) {
+        this.entryTime = entryTime;
+    }
+
+    public List<String> getLicensePlateNos() {
+        return licensePlateNos;
+    }
+
+    public void setLicensePlateNos(List<String> licensePlateNos) {
+        this.licensePlateNos = licensePlateNos;
+    }
 }