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

jinpengyong

2023-08-23 b1bfa089b5b299c1c3c71094e450748a5e5e8a75

 screen-manage/src/main/java/com/moral/api/entity/ManageRole.java

@@ -22,7 +22,10 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ManageRole extends Model<ManageRole> {



    private static final long serialVersionUID = 1L;

@@ -58,10 +61,5 @@
    @TableField("`desc`")
    private String desc;


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

}