Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-10 a17335c7cddc86ffe70d423e7e6e7456b1d6c93a

 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")