Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-16 1e2308326c98c1d95b3d75ab1cac80bb6f828344

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/UserInfoWarpper.java

@@ -25,4 +25,6 @@
    private String emergencyContact;
    @ApiModelProperty("紧急人电话")
    private String emergencyPhone;
    @ApiModelProperty("客服电话")
    private String serviceCell;
}