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

puzhibing

2023-07-18 87c7a162dc7621553022fbabb0486d58629a9c0c

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

@@ -42,11 +42,6 @@
    @TableField("amount")
    private Double amount;
    /**
     * 未分配金额
     */
    @TableField("unallocatedAmount")
    private Double unallocatedAmount;
    /**
     * 支付方式（1=微信，2=系统充值）
     */
    @TableField("payType")