~chenjialiang/moral.git

陈家良 / moral

forked from moral

summary
commits
tree
docs
forks
compare

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

cjl

2023-08-11 eb6d41359a8957c6355275f7697db202d6a523db

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

@@ -41,7 +41,7 @@
    @Autowired
    private SysConfigService sysConfigService;

    @ApiOperation(value = "登陆", notes = "登陆")
    @ApiOperation(value = "登陆信息", notes = "登陆信息")
    @RequestMapping(value = "login", method = RequestMethod.POST)
    public ResultMessage login(@RequestBody Map<String, Object> parameters) {
        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {

			@@ -41,7 +41,7 @@
			@Autowired
			private SysConfigService sysConfigService;

			@ApiOperation(value = "登陆", notes = "登陆")
			@ApiOperation(value = "登陆信息", notes = "登陆信息")
			@RequestMapping(value = "login", method = RequestMethod.POST)
			public ResultMessage login(@RequestBody Map<String, Object> parameters) {
			if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {