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

lidongdong

2022-11-02 68fd2f086d80dd766dd3f84b7a92a2683547fb00

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

@@ -5,6 +5,8 @@

import com.baomidou.mybatisplus.annotation.*;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

/**
@@ -20,7 +22,8 @@
    /**
     * 角色id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;

    /**