Merge branch 'fix_data_typo' into develop

Author: binarywang

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java

@@ -12,7 +12,7 @@ public class WxMpTemplateMessage implements Serializable {
   private String templateId;
   private String url;
   private String topColor;
-  private List<WxMpTemplateData> datas = new ArrayList<WxMpTemplateData>();
+  private List<WxMpTemplateData> data = new ArrayList<WxMpTemplateData>();
 
   public String getToUser() {
     return toUser;
@@ -46,12 +46,16 @@ public void setTopColor(String topColor) {
     this.topColor = topColor;
   }
 
-  public List<WxMpTemplateData> getDatas() {
-    return datas;
+  public List<WxMpTemplateData> getData() {
+    return data;
   }
 
-  public void setDatas(List<WxMpTemplateData> datas) {
-    this.datas = datas;
+  public void setData(List<WxMpTemplateData> data) {
+    this.data = data;
+  }
+
+  public void addWxMpTemplateData(WxMpTemplateData datum) {
+    this.data.add(datum);
   }
 
   public String toJson() {

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java

@@ -30,16 +30,16 @@ public JsonElement serialize(WxMpTemplateMessage message, Type typeOfSrc, JsonSe
       messageJson.addProperty("topcolor", message.getTopColor());
     }
 
-    JsonObject datas = new JsonObject();
-    messageJson.add("data", datas);
+    JsonObject data = new JsonObject();
+    messageJson.add("data", data);
 
-    for (WxMpTemplateData data : message.getDatas()) {
+    for (WxMpTemplateData datum : message.getData()) {
       JsonObject dataJson = new JsonObject();
-      dataJson.addProperty("value", data.getValue());
-      if (data.getColor() != null) {
-        dataJson.addProperty("color", data.getColor());
+      dataJson.addProperty("value", datum.getValue());
+      if (datum.getColor() != null) {
+        dataJson.addProperty("color", datum.getColor());
       }
-      datas.add(data.getName(), dataJson);
+      data.add(datum.getName(), dataJson);
     }
 
     return messageJson;