addOemCardPics

c597350b · 王洁 · fb2cf541 · c597350b
Commit c597350b authored Jan 13, 2020 by 王洁
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

src/MemberCard/Lib/MemberCardInterface.php
+0 -3

No files found.
--- a/src/MemberCard/Lib/MemberCardInterface.php
+++ b/src/MemberCard/Lib/MemberCardInterface.php
@@ -179,11 +179,8 @@ interface MemberCardInterface
   * @return array       //['bonus'=>0,'recordNum'=>0]
   */
  public function getUserBonus(int $storeId,int $userId);
-<<<<<<< HEAD
  
-=======

->>>>>>> ft-bonus
  /**
   * 添加oem微信卡券相关图片素材（copy oem=0的，每增加一个oem调用一次）
   *