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

zjj

2023-11-27 a61d079d0c7ebc50ddd088bfb568a21bb2f2592d

 src/main/java/com/zy/common/web/AuthController.java

@@ -91,7 +91,7 @@
        HashMap<String, Object> map = new HashMap<>();
        map.put("loginLogo", loginLogo.getValue());
        map.put("loginCopyrightText", loginCopyrightText.getValue());
        map.put("loginCopyrightImg1", loginCopyrightImg1.getValue());
        map.put("loginCopyrightImg1", loginCopyrightImg1.getStatus() == 1 ? loginCopyrightImg1.getValue() : "");

        return R.ok().add(map);
    }