Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-service/src/main/java/com/fs/his/param/FsIntegralGoodsListUParam.java

@@ -10,8 +10,6 @@ public class FsIntegralGoodsListUParam  implements Serializable {
     Integer goodsType;
     @ApiModelProperty(value = "页码,默认为1")
     private Integer pageNum =1;
-
-    private Integer page =1;
     @ApiModelProperty(value = "页大小,默认为10")
     private Integer pageSize = 10;
     private String keyword;

fs-user-app/src/main/java/com/fs/app/controller/IntegralController.java

@@ -55,8 +55,7 @@ public class IntegralController extends  AppBaseController {
     @Cacheable(value = "getIntegralGoodsList", key = "#param")
     public R getIntegralGoodsList(FsIntegralGoodsListUParam param)
     {
-        Integer pageNum = param.getPageNum()!=null?param.getPageNum():param.getPage();
-        PageHelper.startPage(pageNum, param.getPageSize());
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsIntegralGoodsListUVO> list=goodsService.selectFsIntegralGoodsListUVO(param);
         PageInfo<FsIntegralGoodsListUVO> listPageInfo=new PageInfo<>(list);
         return R.ok().put("data",listPageInfo);