Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 bad6c62c063a701af797d5bed697af1264e7a370

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

@@ -44,6 +44,7 @@

    @ApiModelProperty(value = "预约时间")
    @TableField("subscribe_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime subscribeTime;

    @ApiModelProperty(value = "服务方式（1=上门服务，2=到店服务）")
@@ -69,4 +70,5 @@
    private LocalDateTime createTime;



}