解决冲突

liurunyu

2024-07-25 7af935e6a092193adf309f3a2d700f049b4b63d8

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java

@@ -110,8 +110,7 @@
     * @return
     */
    public String getCardStateByCardNum(Long cardNum) {
        String stateName = Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(cardNum)).orElse("");
        return stateName;
        return Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(cardNum)).orElse("");
    }

    /**
@@ -170,4 +169,6 @@

        return rsVo ;
    }


}