Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 e6fa0149e0c8690efc9c444650c6ef82f04ba54b

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUserShop.java

@@ -28,4 +28,9 @@
    */
   @TableField("shop_id")
   private Integer shopId;
   /**
    * 角色（1=店长，2=店员，3=技师）
    */
   @TableField("role_type")
   private Integer roleType;
}