Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-10 18e68871f0423910f748a727ceab297a8e4765d1

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

@@ -32,7 +32,7 @@

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Long id;
    private Integer id;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
@@ -40,7 +40,7 @@

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

    @ApiModelProperty(value = "预约时间")
    @TableField("subscribe_time")
@@ -77,7 +77,7 @@
    private String idStr;


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