Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cloud-market2-common/src/main/java/com/muyu/data/AliPay.java
#	cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java
#	cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
#	cloud-market2-server/src/main/resources/bootstrap.yml

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