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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

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

@@ -2,8 +2,6 @@

import com.moral.api.entity.GroupMenu;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.groupMenu.GroupMenuDTO;
import com.moral.api.pojo.form.groupMenu.GroupMenuUpdateForm;

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

    public GroupMenuDTO updateGroupMenu(GroupMenuUpdateForm form);


}