Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-10 9d1b09f48020e2321693a0475cd87131dda57b22

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java

@@ -40,7 +40,7 @@

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

    @ApiModelProperty(value = "预约时间")
    @TableField("subscribe_time")
@@ -71,9 +71,14 @@


    @ApiModelProperty(value = "订单id")
    @TableField(exist = false)
    private Long orderId;

    @TableField(exist = false)
    private String idStr;


    public void setId(Long id) {
        this.id = id;
        this.idStr = String.valueOf(id);
    }
}