Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

doc/update_0619.sql

@@ -2,3 +2,7 @@
 alter table welcome_visitor
     add driver_name varchar(32) not null comment '司机名称' after name;
 
+-- 访客表新增校区id字段
+alter table welcome_visitor
+    add school_id varchar(32) not null comment '校区id' after name;
+

src/main/java/com/template/model/pojo/WelcomeVisitor.java

@@ -45,6 +45,9 @@ public class WelcomeVisitor implements Serializable {
     @ApiModelProperty(value = "证件号")
     private String cardId;
 
+    @ApiModelProperty(value = "校区id")
+    private String schoolId;
+
     @ApiModelProperty(value = "校区名称")
     private String school;
 

src/main/java/com/template/model/request/WelcomeVisitorRequest.java

@@ -42,6 +42,10 @@ public class WelcomeVisitorRequest implements Serializable {
     @NotBlank(message = "证件号不能为空")
     private String cardId;
 
+    @ApiModelProperty(value = "校区id")
+    @NotBlank(message = "校区id不能为空")
+    private String schoolId;
+
     @ApiModelProperty(value = "校区名称")
     @NotBlank(message = "校区名称不能为空")
     @Pattern(regexp = "^(墨轩湖校区|黄家湖校区)$", message = "校区名称只能为墨轩湖校区或黄家湖校区")

src/main/java/com/template/model/vo/WelcomeVisitorVO.java

@@ -1,5 +1,6 @@
 package com.template.model.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -37,6 +38,10 @@ public class WelcomeVisitorVO implements Serializable {
     @ExcelProperty("证件号")
     private String cardId;
 
+    @ApiModelProperty(value = "校区id")
+    @ExcelIgnore
+    private String schoolId;
+
     @ApiModelProperty(value = "校区名称")
     @ExcelProperty("校区名称")
     private String school;