Merge remote-tracking branch 'origin/master'

doum

3 天以前 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardParamServiceImpl.java

@@ -114,9 +114,9 @@
        QueryWrapper<Card> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(Card::getParamId,cardParam.getId());

        Integer integer = cardMapper.selectCount(wrapper);
        Long integer =Constants.formatLongNum( cardMapper.selectCount(wrapper));

        if (integer > Constants.ZERO){
        if (integer!=null && integer > Constants.ZERO){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"卡已经生成不允许修改配置");
        }
        CardParam update = new CardParam();