Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-04 79e82d188a24ad92395ac4b39c1a49266a647c3f

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

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
@@ -1,4 +1,4 @@
package model;
package com.ruoyi.order.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -44,10 +44,18 @@
    @TableField("order_status")
    private Integer orderStatus;

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

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

    @ApiModelProperty(value = "售后截止日期")
    @TableField("after_sale_time")
    private LocalDateTime afterSaleTime;

    @ApiModelProperty(value = "技师id")
    @TableField("technician_id")
    private Integer technicianId;