Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 8c83fad498da51773d4aa6a4aa6af13f8e39e27d

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

@@ -30,6 +30,10 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "门店id")
    @TableField("shop_id")
    private Integer shopId;