Skip to content

企业微信相关bean增加@Data注解 #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 22, 2020
Merged

企业微信相关bean增加@Data注解 #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cf4a61
增加@Data注解
Mar 20, 2020
cbe5a8c
增加control类型为Attendance的数据结构
Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public class ContentValue implements Serializable {

private List<ContentValue.Child> children;

private Attendance attendance;

@Data
public static class Date implements Serializable {
private static final long serialVersionUID = -6181554080062231138L;
Expand Down Expand Up @@ -91,4 +93,27 @@ public static class Child implements Serializable {
private List<Content> list;
}


@Data
public static class Attendance implements Serializable {
private static final long serialVersionUID = -6627566040706594166L;
@SerializedName("date_range")
private DataRange dateRange;
private Integer type;

@Data
public static class DataRange implements Serializable {
private static final long serialVersionUID = -3411836592583718255L;
private String type;
@SerializedName("new_begin")
private Long begin;
@SerializedName("new_end")
private Long end;
@SerializedName("new_duration")
private Long duration;
}
}



}
3 changes: 3 additions & 0 deletions weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package me.chanjar.weixin.cp.bean.oa.templatedata;

import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
* @author gyv123@163.com
*/
@Data
public class TemplateOptions implements Serializable {

private static final long serialVersionUID = -7883792668568772078L;
Expand Down
6 changes: 2 additions & 4 deletions weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package me.chanjar.weixin.cp.bean.oa.templatedata;

import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import me.chanjar.weixin.cp.bean.oa.WxCpTemplateResult;
import me.chanjar.weixin.cp.bean.oa.templatedata.control.TemplateContact;
import lombok.Data;

import java.io.Serializable;
import java.util.List;
import java.util.Map;

/**
* @author gyv12345@163.com
*/
@Data
public class TemplateProperty implements Serializable {

private static final long serialVersionUID = -3429251158540167453L;
Expand Down