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

zhibing.pu

2024-05-13 7ea05c419cb4cdf92f2c1a747ff0570aca226d20

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java

@@ -31,11 +31,6 @@
    @TableField("remainingAmount")
    private Double remainingAmount;
    /**
     * 过期时间
     */
    @TableField("expirationTime")
    private Date expirationTime;
    /**
     * 添加时间
     */
    @TableField("insertTime")
@@ -77,6 +72,5 @@
    @TableField("redPacketActivityId")
    private Integer redPacketActivityId;

    private Double distance;

}