Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f

 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/RoleAndMenuDto.java

文件名从 laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/RoleAndMenuDto.java 修改
@@ -16,7 +16,7 @@
@Data
public class RoleAndMenuDto implements Serializable {

    private Long  roleId;
    private String  roleId;

    private String roleName;