diff --git a/cloud-market2-common/src/main/java/com/muyu/data/AliPay.java b/cloud-market2-common/src/main/java/com/muyu/data/AliPay.java
index 3d009bb..687b127 100644
--- a/cloud-market2-common/src/main/java/com/muyu/data/AliPay.java
+++ b/cloud-market2-common/src/main/java/com/muyu/data/AliPay.java
@@ -10,10 +10,9 @@ public class AliPay {
     private double totalAmount;
     //商品名称
     private String subject;
-<<<<<<< HEAD
 
-=======
->>>>>>> origin/master
+
+
     //订单追踪号，商户自己生成，可已不使用
     private String alipayTraceNo;
 }