Merge remote-tracking branch 'origin/master'

k94314517

2024-07-17 4ea4ea2378a9244b75e43aae9a3fd09ead0af4b3

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