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

jinpengyong

2023-11-15 be8a4a6f82bd32dc5a3cf2e038848012f336f644

 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"))) {