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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java

@@ -197,12 +197,9 @@
    @ApiModelProperty("再投数量")
    @TableField(exist = false)
    private Integer reInvestment=0;






    @ApiModelProperty("待预约数量")
    @TableField(exist = false)
    private Integer pending=0;

    @ApiModelProperty("是否为再投单")
    @TableField("is_reinvest")