Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-30 2a498d9f65f873cedb74ab5bcb48ad4b845d0622

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java

@@ -55,6 +55,6 @@
    private String merchantName;
    @ApiModelProperty("商户电话")
    private String merchantPhone;
    @ApiModelProperty("商户身份证号码")
    @ApiModelProperty("商户身份证号码【1.1】")
    private String merchantIDCode;
}