解决冲突

mg

2022-10-28 2d964c50c7ac6557e968328e5931006686c4cfbb

 ycl-common/src/main/java/com/ycl/entity/user/AdminMenuRelation.java

@@ -45,5 +45,10 @@
    @TableField("is_start")
    private Integer isStart;

    /**
     * 菜单序号
     */
    @TableField("sort")
    private Integer sort;

}