Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f

 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);