Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @注释:
  */
 @Data
-public class PlanListRequest extends PageBasicInfo {
+public class PlanListRequest  {
     @ApiModelProperty("店铺名称")
     private String shopName;
     @ApiModelProperty("起始日期")
@@ -26,5 +26,9 @@ public class PlanListRequest extends PageBasicInfo {
     private List<String> regionIds;
     @ApiModelProperty("审核状态")
     private Integer resultType;
+    @ApiModelProperty ("页码")
+    private Integer pageNumber;
+    @ApiModelProperty ("分页大小")
+    private Integer pageSize;
 
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java

@@ -72,7 +72,6 @@ public class FirstOrderServiceImp implements FirstOrderService {
             //第一次提交
             order.setCreateTime(new Date());
             order.setCreateUserId(userId);
-            order.setUpdateUserId(userId);
             num = firstOrderDAO.insertFirstOrder(order);
         } else {
             //修改只更新下面2个

coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java

@@ -133,7 +133,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
     @Override
     public PageInfo<OpeningOperationPlanListVO> getPlanListPage(PlanListRequest request) {
         log.info("getPlanListPage request:{}", JSONObject.toJSONString(request));
-        PageHelper.startPage(request.getPageNum(), request.getPageSize());
+        PageHelper.startPage(request.getPageNumber(), request.getPageSize());
         //去shop_info表查询店铺名字，店铺code，开店负责人id，督导id，区域id，lineinfo 加盟商name，手机号，招商经理id,open_plan,提交时间，审核状态
         //TODO 拆表 产品沟通限定时间
         List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = openingOperationPlanDAO.getOpenPlanShopListByCondition(request);