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

chen_xi

2022-09-27 f4ab89e7032bea8d3c7e05a44946c3fdb58b7473

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

@@ -22,7 +22,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("`groupMenu`")
@TableName("`group`")
public class Group extends Model<Group> {

    private static final long serialVersionUID = 1L;
@@ -61,9 +61,5 @@
    private String isDelete;


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

}