Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-02 4c6d6ff48364eb56a7d61ca0877fd98f1ff9b447

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

@@ -33,6 +33,9 @@
    @TableId("id")
    private Long id;

    @ApiModelProperty(value = "用户类型（1-普通用户，2-门店员工）")
    private Integer userType;

    @ApiModelProperty(value = "用户")
    @TableField("name")
    private String name;