From 8aa4758e0161909ebaccd2cf1f8c293d8a7c8e06 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 8 Mar 2020 20:37:10 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20#1425=20=E4=BF=AE=E5=A4=8D=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1OA=E5=AE=A1=E6=89=B9=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=87=A0=E4=B8=AA=E5=8F=82=E6=95=B0=E7=9A=84=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=88=96=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/bean/oa/WxCpApprovalComment.java  |  1 -
 .../weixin/cp/bean/oa/WxCpApprovalDetail.java   |  8 ++++----
 .../cp/bean/oa/applydata/ContentValue.java      | 17 ++++-------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalComment.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalComment.java
index 8a70e3e6e..1bf06ec51 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalComment.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalComment.java
@@ -13,7 +13,6 @@ import java.util.List;
  */
 @Data
 public class WxCpApprovalComment implements Serializable {
-
   private static final long serialVersionUID = -5430367411926856292L;
 
   /**
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java
index 5021a57ee..a22a43584 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java
@@ -13,7 +13,6 @@ import java.util.List;
  */
 @Data
 public class WxCpApprovalDetail implements Serializable {
-
   private static final long serialVersionUID = 1353393306564207170L;
 
   /**
@@ -49,19 +48,20 @@ public class WxCpApprovalDetail implements Serializable {
   /**
    * 申请人信息
    */
-  private WxCpApprovalApplyer applyer;
+  @SerializedName("applyer")
+  private WxCpApprovalApplyer applier;
 
   /**
    * 审批流程信息，可能有多个审批节点
    */
   @SerializedName("sp_record")
-  private WxCpApprovalRecord spRecord;
+  private WxCpApprovalRecord[] spRecords;
 
   /**
    * 抄送信息，可能有多个抄送节点
    */
   @SerializedName("notifyer")
-  private WxCpOperator notifyer;
+  private WxCpOperator[] notifiers;
 
   /**
    * 审批申请数据
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
index 7798338aa..609b8dfb7 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
@@ -11,16 +11,15 @@ import java.util.List;
  */
 @Data
 public class ContentValue implements Serializable {
-
   private static final long serialVersionUID = -5607678965965065261L;
 
   private String text;
 
   @SerializedName("new_number")
-  private Integer newNumber;
+  private Double newNumber;
 
   @SerializedName("new_money")
-  private Integer newMoney;
+  private Double newMoney;
 
   private ContentValue.Date date;
 
@@ -36,24 +35,21 @@ public class ContentValue implements Serializable {
 
   @Data
   public static class Date implements Serializable {
-
     private static final long serialVersionUID = -6181554080062231138L;
     private String type;
 
     @SerializedName("s_timestamp")
-    private Long timestamp;
+    private Double timestamp;
   }
 
   @Data
   public static class Selector implements Serializable {
-
     private static final long serialVersionUID = 7305458759126951773L;
     private String type;
     private List<Option> options;
 
     @Data
     public static class Option implements Serializable {
-
       private static final long serialVersionUID = -3471071106328280252L;
       private String key;
 
@@ -74,28 +70,23 @@ public class ContentValue implements Serializable {
 
   @Data
   public static class Department implements Serializable {
-
     private static final long serialVersionUID = -2513762192924826234L;
 
     @SerializedName("openapi_id")
-
     private String openApiId;
     private String name;
   }
 
   @Data
   public static class File implements Serializable {
-
     private static final long serialVersionUID = 3890971381800855142L;
+
     @SerializedName("file_id")
     private String fileId;
-
-
   }
 
   @Data
   public static class Child implements Serializable {
-
     private static final long serialVersionUID = -3500102073821161558L;
     private List<Content> list;
   }