Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-28 f202fd9cf5ab399e8d34812ab44163af3ac78672

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

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

    private static final long serialVersionUID = 1L;