解决冲突

src/MemberCard/Lib/MemberCardInterface.php

@@ -21,12 +21,9 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetOrder(int $storeId,int $id)
  * @method ResultInterface deferGetOrder(int $storeId,int $id)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
  * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId,int $escrow)
  * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId,int $escrow)
-<<<<<<< HEAD
  * @method ResultInterface deferGetUserCouponDetail(int $storeId ,int $couponId)  
  * @method ResultInterface deferGetUserCouponDetail(int $storeId ,int $couponId)  
  * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
  * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
  *  @method ResultInterface deferGetUserValidCouponNum(int $storeId,int $escrow,int $userId)
  *  @method ResultInterface deferGetUserValidCouponNum(int $storeId,int $escrow,int $userId)
-=======
->>>>>>> coupon
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -80,7 +77,6 @@ interface MemberCardInterface
    * @param integer $escrow
    * @param integer $escrow
    * @return bool
    * @return bool
    */
    */
-<<<<<<< HEAD
    public function ifUserGetCard(int $storeId,int $userId,int $escrow);
    public function ifUserGetCard(int $storeId,int $userId,int $escrow);
 
 
    /**
    /**
@@ -111,7 +107,4 @@ interface MemberCardInterface
    * @return int
    * @return int
    */
    */
    public function getUserValidCouponNum(int $storeId,int $escrow,int $userId);
    public function getUserValidCouponNum(int $storeId,int $escrow,int $userId);
-=======
-  public function ifUserGetCard(int $storeId,int $userId,int $escrow);
+}
\ No newline at end of file
->>>>>>> coupon
-}