Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-24 bd927f5c9f26d5ae89a272e56a4b3bd655bd148f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsMerchantService.java

@@ -70,12 +70,12 @@
    /**
     * 完成订单更新/新增商家信息
     *
     * @param merchantName
     * @param orderNo
     * @param configId
     * @param userId
     * @return
     */
    R updateOrAddMcsMerchantAfterOrder(String merchantName, Long configId, Long userId);
    R updateOrAddMcsMerchantAfterOrder(String orderNo, Long configId, Long userId);

    /**
     * 验证码登录