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

# Conflicts:
#	jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
This commit is contained in:
zer0Black
2022-02-24 13:00:09 +08:00
11 changed files with 98 additions and 57 deletions
@@ -133,7 +133,7 @@ public class LoginController {
@ApiOperation("获取验证码")
@GetMapping(value = "/randomImage/{key}")
public Result<String> randomImage(HttpServletResponse response,@PathVariable String key){
return randomImage(response,key);
return loginService.randomImage(response,key);
}
/**