Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-28 b2a64967d13f68175cd0c47f1a5b6169c42ed8a9

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