Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

 screen-api/src/main/java/com/moral/api/entity/ManageMenu.java

@@ -15,7 +15,7 @@
 * </p>
 *
 * @author moral
 * @since 2021-03-09
 * @since 2021-04-19
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -69,10 +69,11 @@
     */
    private String isDelete;

    /**
     * 描述
     */
    private String desc;

    @Override
    protected Serializable pkVal() {
        return this.id;
    }


}