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

puzhibing

2023-07-20 e8ce24f3a378d1fdb5c1c9e6fbecb067aa22cdd9

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Driver.java

@@ -247,4 +247,9 @@
     */
    @TableField("merchantIDCode")
    private String merchantIDCode;
    /**
     * 是否打开下单二维码
     */
    @TableField("openOrderQRCode")
    private Integer openOrderQRCode;
}