Merge branch 'refs/heads/dev' into test

share-front/src/main/java/share/web/controller/system/SharingActivitiesController.java

 package share.web.controller.system;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import share.common.annotation.Log;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.core.page.TableDataInfo;
-import share.common.enums.BusinessType;
-import share.common.utils.poi.ExcelUtil;
-import share.system.domain.EquityFundLog;
 import share.system.domain.SConsumer;
 import share.system.domain.SharingActivities;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.domain.vo.SharingActivitiesVo;
 import share.system.service.SharingActivitiesService;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -37,7 +33,7 @@ public class SharingActivitiesController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(SharingActivitiesVo sharingActivities) {
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
-        sharingActivities.setNewUid(user.getId());
+        sharingActivities.setUid(user.getId());
         startPage();
         List<SharingActivities> list = sharingActivitiesService.selectSharingActivitiesList(sharingActivities);
         TableDataInfo dataTable = getDataTable(list);