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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

 screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java

@@ -29,7 +29,7 @@
@Slf4j
@Api(tags = {"角色"})
@RestController
@RequestMapping("/role")
@RequestMapping("/manageRole")
public class ManageRoleController {

    @Autowired