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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

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


}