Merge remote-tracking branch 'origin/master'

jiangping

2024-07-30 918bbf3afade9011ca666ba0680e3f79039a0ce7

 server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java

@@ -20,7 +20,7 @@
@Service
public interface ZbomCRMService {

    int dealCustomerLogData(CustomerLog customerLog);
    void dealCustomerLogData(CustomerLog customerLog);
    String zbomEncode(String str);
    String getCrmGoUrl(String userName,Integer type);