Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PayDataVo.java

 package com.liquidnet.service.kylin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -8,19 +10,30 @@ import java.io.Serializable;
 public class PayDataVo implements Serializable {
 
     private static final long serialVersionUID = -5841205289132250565L;
+    @JsonProperty("appId")
     private String appid;
-
+    @JsonProperty("appid")
+    private String appId;
+    @JsonProperty("nonceStr")
     private String noncestr;
+    @JsonProperty("noncestr")
+    private String nonceStr;
+    @JsonProperty("timeStamp")
+    private String timestamp;
+    @JsonProperty("timestamp")
+    private String timeStamp;
+
 
+    @JsonProperty("package")
+    private String packageOther;
     private String packages;
 
     private String partnerid;
-
     private String prepayid;
-
     private String sign;
-
-    private long timestamp;
+    private String mweb_url;
+    private String paySign;
+    private String signType;
 
     private String redirect_url;
     private String order_str;