首页-会员概览-左侧趋势图

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -265,7 +265,13 @@ public class IndexModuleController {
         return RestResponse.success(data);
     }
 
-
+    /**
+     * 首页-会员概览-左侧趋势
+     * @param type
+     * @param cardAreaId
+     * @param brandId
+     * @return
+     */
     @RequestMapping("list-member-data")
     public RestResponse listMember(Integer type, Long cardAreaId, Integer brandId){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/MemberDataVO.java

@@ -52,6 +52,9 @@ public class MemberDataVO implements Serializable {
     }
 
     public String getDate() {
+        if (date == null) {
+            return dateData;
+        }
         return date;
     }