Merge remote-tracking branch 'origin/master'

xuhy

2025-01-07 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java

@@ -57,6 +57,10 @@
     * 用户信息
     */
    private SysUser sysUser;
    /**
     * 用户类型（系统用户，小程序用户）
     */
    private String userType;

    public String getToken()
    {
@@ -147,4 +151,12 @@
    {
        this.sysUser = sysUser;
    }
    
    public String getUserType() {
        return userType;
    }
    
    public void setUserType(String userType) {
        this.userType = userType;
    }
}