Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java

@@ -1,9 +1,10 @@
package com.panzhihua.service_user.model.dos;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -18,9 +19,9 @@
    /**
     * 用户id
     */
    private Long  userId;
    private Long userId;
    /**
     * 角色id
     */
    private Long  roleId;
    private Long roleId;
}