Merge branch 'master-chw' into dev-chw

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityDTO.java

 package com.xxfc.platform.activity.dto;
 
 import com.github.wxiaoqi.security.common.vo.PageParam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,5 +27,7 @@ public class ActivityDTO extends PageParam {
      private Integer type;
      private Integer userId;
      private Integer activityId;
+     @ApiModelProperty(value = "时间戳")
+     private Long time;
 
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityController.java

@@ -26,6 +26,7 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
     @GetMapping("app/unauth/selectList")
     @IgnoreUserToken
     public ObjectRestResponse<PageDataVO<ActivityVo>> selectList( ActivityDTO activityDTO) {
+        activityDTO.setTime(System.currentTimeMillis());
         return baseBiz.getAllByPage(activityDTO);
     }