Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java

@@ -38,7 +38,7 @@
    @ApiModelProperty("头像")
    private String headImgUrl;
    @ApiModelProperty("驾驶证照片正面")
    private String driveCardImgUrl1;
    private String driveCardImgUrl;
    @ApiModelProperty("驾驶证照片背面")
    private String driveCardImgUrl2;

@@ -155,12 +155,12 @@
        this.headImgUrl = headImgUrl;
    }

    public String getDriveCardImgUrl1() {
        return driveCardImgUrl1;
    public String getDriveCardImgUrl() {
        return driveCardImgUrl;
    }

    public void setDriveCardImgUrl1(String driveCardImgUrl1) {
        this.driveCardImgUrl1 = driveCardImgUrl1;
    public void setDriveCardImgUrl(String driveCardImgUrl) {
        this.driveCardImgUrl = driveCardImgUrl;
    }

    public String getDriveCardImgUrl2() {
@@ -196,7 +196,6 @@
                ", email='" + email + '\'' +
                ", placeOfPracticeId=" + placeOfPracticeId +
                ", headImgUrl='" + headImgUrl + '\'' +
                ", driveCardImgUrl1='" + driveCardImgUrl1 + '\'' +
                ", driveCardImgUrl2='" + driveCardImgUrl2 + '\'' +
                '}';
    }