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

kaiyu

2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c

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

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



}