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

lizijie

2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790

 screen-manage/src/main/java/com/moral/api/service/GroupMenuService.java

@@ -13,4 +13,6 @@
 */
public interface GroupMenuService extends IService<GroupMenu> {



}