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

lizijie

2021-06-17 b98a61c0c707c9fc3a51e68fe67909cb06aaafcd

 screen-api/src/main/java/com/moral/api/controller/GroupController.java

@@ -27,7 +27,7 @@
import com.moral.util.PageResult;

@Slf4j
@Api(tags = {"组"})
@Api(tags = {"组管理"})
@RestController
@RequestMapping("/group")
public class GroupController {