Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitan...

manailin

2022-09-14 29167f6c5d895749f369fadbcd4b3c0a3a17052c

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

    /**
     * 验证码登录