Merge remote-tracking branch 'origin/master'

xusd

2024-09-15 de9369d2c8056e2bb723247b0e877fe9d96f8def

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java

@@ -335,6 +335,9 @@
            }
            // 判断账号是否存在
            CtAccount ctAccount = this.getByAccAndType(gridUserBaseDTO.getAccount(), UserBaseConsts.ACC_TYPE_1);
            if(ObjectUtils.isEmpty(ctAccount)){
                ctAccount = this.getByAccAndType(gridUserBaseDTO.getMobile(), UserBaseConsts.ACC_TYPE_1);
            }
            if (ObjectUtils.isNotEmpty(ctAccount)){
                //返回结果
                UserLoginDTO userLoginDTO = new UserLoginDTO();