Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/constant/DateTypeEnum.java

+package com.gic.cloud.web.constant;
+
+public enum DateTypeEnum {
+    DAY(1,"天"),
+    WEEK(2, "周"),
+    MONTH(3, "月"),
+    YEAR(4, "年"),
+    L3DAY(5, "近三天"),
+    L7DAY(6, "近七天");
+
+    private Integer type;
+    private String message;
+
+    DateTypeEnum(Integer type, String message){
+        this.type = type;
+        this.message = message;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/qo/DateTypeQo.java

+package com.gic.cloud.web.qo;
+
+public class DateTypeQo {
+    private Integer type;
+    private String date;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+}