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

This commit is contained in:
joylink_zhangsai 2021-06-11 17:47:49 +08:00
commit c3d4688268

View File

@ -72,6 +72,12 @@ public class SimulationCommonController {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@GetMapping("/{id}/member/playedBy/{userId}")
public SimulationMemberVO queryUserPlayedMember(@PathVariable String id, @PathVariable String userId) {
return this.simulationManager.getById(id)
.getSimulationMemberByUserId(userId).convertToVO();
}
@PostMapping("/{id}/member/{memberId}/operate/{type}") @PostMapping("/{id}/member/{memberId}/operate/{type}")
public Object operate(@PathVariable String id, @PathVariable String memberId, public Object operate(@PathVariable String id, @PathVariable String memberId,
@PathVariable String type, @RequestBody Map<String, Object> params) { @PathVariable String type, @RequestBody Map<String, Object> params) {