Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/haikong/dto/OrderInfoDTO.java

@@ -15,7 +15,7 @@ public class OrderInfoDTO implements Serializable {
 
     private static final long serialVersionUID = -1110285187874182199L;
 
-    @JsonProperty("outer_order_no")
+    @JsonProperty("out_trade_no")
     private String outerOrderNo;
 
     @JsonProperty("pay_app")