Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 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;
}