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

kaiyu

2021-06-24 eb51b2364e9a3fbe806fde61fa255660a098fc8b

 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;