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

lidongdong

2022-10-10 29f10e0fc638d36ec9106d5c023a50fed30583fd

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -50,7 +50,7 @@

        SysUser user=null;
        //管理员登录
        if(StringUtils.equals("zigonggaoadmin",account))
        if(StringUtils.equals("zigonggaoadmin",account) || StringUtils.equals("ceshirenyuan",account) )
        {
            user= IUserService.getUserByAccount(account);

@@ -99,6 +99,7 @@
            newSysUser.setAvatar(huaChengSysUser.getImageUrl());
            newSysUser.setCreateTime(LocalDateTime.now());
            newSysUser.setUpdateTime(LocalDateTime.now());
            newSysUser.setOpenid(huaChengSysUser.getOpenid());
            IUserService.insertConfig(newSysUser);
        }