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/AppUser.java

@@ -100,4 +100,14 @@
     */
    @TableField("inviterId")
    private Integer inviterId;
    /**
     * 取消订单次数，取消一次加一，若成功接单清零
     */
    @TableField("cancelCount")
    private Integer cancelCount;
    /**
     * 是否拥有9.5折优惠 1是 0否
     */
    @TableField("havDiscount")
    private Integer havDiscount;
}