update: 处理冲突

21868e23 · luhongguang · cb85a8af · 21868e23
Commit 21868e23 authored Aug 31, 2021 by luhongguang
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

MarketingService.php application/services/marketing/MarketingService.php +0 -3

No files found.
--- a/application/services/marketing/MarketingService.php
+++ b/application/services/marketing/MarketingService.php
@@ -550,8 +550,6 @@ class MarketingService
                        throw new GoodsException(['cus' => 48]);
                    }
                }
-<<<<<<< HEAD
-=======
            }else{
                //比例计算
                if ($commissionMode == Marketing::COMMISSION_MODE_RATE) {
@@ -568,7 +566,6 @@ class MarketingService
                        throw new MarketingException(['cus'=>33]);
                    }
                }
->>>>>>> colonel
            }

            $colums[$key]['marketing_id'] = $marketingId;