Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

 ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java

@@ -44,6 +44,10 @@
    @TableField("order_status")
    private Integer orderStatus;

    @ApiModelProperty(value = "是否已分佣: 0-否 1-是")
    @TableField("is_commission")
    private Integer isCommission;

    @ApiModelProperty(value = "核销时间")
    @TableField("end_time")
    private LocalDateTime endTime;