Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-30 34eb869e7350173ff036881fc776bc27d5be6d7a

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

@@ -37,6 +37,11 @@
    @TableField("orderId")
    private Long orderId;
    /**
     * 充值记录id
     */
    @TableField("rechargeRecordId")
    private Integer rechargeRecordId;
    /**
     * 第三方分账业务订单id
     */
    @TableField("merOrderId")