--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/BatchUpdateSortForm.java

@@ -11,8 +11,8 @@ import lombok.Data;
 @ApiModel("修改排序号form")
 public class BatchUpdateSortForm {
 
-	@ApiModelProperty("id集合")
-	private List<Integer> ids;
+	@ApiModelProperty("商品列表id")
+	private Integer id;
 	@ApiModelProperty("排序号")
 	private Integer sort;
 	

com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/recommend/BatchRecommendGoodsForm.java

+package com.zrqx.core.form.sysuser.bg.recommend;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class BatchRecommendGoodsForm {
+	@ApiModelProperty("推荐位id")
+	private Integer recomId;
+	@ApiModelProperty("推荐位下商品列表id")
+	private List<Integer> ids;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/recommend/RecommendGetCoodsForm.java

+package com.zrqx.core.form.sysuser.bg.recommend;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel("获取从资源调用的条件")
+public class RecommendGetCoodsForm {
+
+	@ApiModelProperty("推荐位id")
+	private Integer recomId;	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/fg/activity/QueryActivityApplyForm.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel(value="QueryActivityApplyForm",description="报名信息form")
+@ApiModel(value="QueryActivityApplyForm",description="保存报名信息form")
 public class QueryActivityApplyForm {
 
 	@ApiModelProperty("活动id")

com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/fg/activity/UpdateActivityApplyForm.java

+package com.zrqx.core.form.sysuser.fg.activity;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+@Data
+@ApiModel(value="UpdateActivityApplyForm",description="修改报名信息form")
+public class UpdateActivityApplyForm {
+
+
+	@ApiModelProperty("活动报名id")
+	private Integer activityApplyId;
+	/**
+	 * [
+	 * 	{type:text,name:姓名,value:张三},
+	 *  {type:redio,name:性别,value:男},
+	 *  {type:file,name:头像,value:/2019/03/uuid.jpg}
+	 * ]
+	 */
+	@ApiModelProperty("反馈值JSON格式  示例[{type:text,name:姓名,value:张三},{type:redio,name:性别,value:男},{type:file,name:头像,value:/2019/03/uuid.jpg}] ")
+	private String value;
+}

com.zrqx.core/src/main/java/com/zrqx/core/util/page/PageInfo.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import com.github.pagehelper.Page;
 
@@ -61,6 +62,59 @@ public class PageInfo<T> implements Serializable {
         this(list, 8);
     }
 
+    public PageInfo(List<?> list, List<T> target) {
+    	this(list, 8, (p) -> {
+    		p.list = target;
+    	});
+    }
+    /**
+     * 包装Page对象
+     *
+     * @param list          page结果
+     * @param navigatePages 页码数量
+     * @param con  最后执行 消费PageInfo 对象程序
+     */
+    public PageInfo(List<?> list, int navigatePages, Consumer<PageInfo<T>> con) {
+        if (list instanceof Page) {
+            Page page = (Page) list;
+            this.pageNum = page.getPageNum();
+            this.pageSize = page.getPageSize();
+
+            this.pages = page.getPages();
+            this.list = page;
+            this.size = page.size();
+            this.total = page.getTotal();
+            //由于结果是>startRow的，所以实际的需要+1
+            if (this.size == 0) {
+                this.startRow = 0;
+                this.endRow = 0;
+            } else {
+                this.startRow = page.getStartRow() + 1;
+                //计算实际的endRow（最后一页的时候特殊）
+                this.endRow = this.startRow - 1 + this.size;
+            }
+        } else if (list instanceof Collection) {
+            this.pageNum = 1;
+            this.pageSize = list.size();
+
+            this.pages = this.pageSize > 0 ? 1 : 0;
+            this.size = list.size();
+            this.total = list.size();
+            this.startRow = 0;
+            this.endRow = list.size() > 0 ? list.size() - 1 : 0;
+        }
+        if (list instanceof Collection) {
+            this.navigatePages = navigatePages;
+            //计算导航页
+            calcNavigatepageNums();
+            //计算前后页，第一页，最后一页
+            calcPage();
+            //判断页面边界
+            judgePageBoudary();
+        }
+        // 
+        con.accept(this);
+    }
     /**
      * 包装Page对象
      *

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/bg/recommend/GoodsVo.java

 package com.zrqx.core.vo.sysuser.bg.recommend;
 
-import java.util.Date;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
 import lombok.Data;
 
 @Data
 @ApiModel("推荐位使用的商品vo")
 public class GoodsVo {
 	@ApiModelProperty(value="图书名称")
-	private String goodsName;
+	private String name;
 	@ApiModelProperty(value="作者")
 	private String author;
 	@ApiModelProperty(value="ISBN")
-	private String ISBN;
+	private String isbn;
 	@ApiModelProperty(value="定价")
-	private Double price;
+	private BigDecimal price;
 	@ApiModelProperty(value="出版时间")
 	private Date publishTime;
 	@ApiModelProperty(value="上传时间即图书添加时间")

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/collections/CollectionsVo.java

 package com.zrqx.core.vo.sysuser.fg.collections;
 
+import java.util.List;
+
+import com.zrqx.core.vo.resource.fg.goods.FgResourceVo;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +17,7 @@ public class CollectionsVo {
 	@ApiModelProperty(value="商品类别 ")
 	private String goodsType;
 	@ApiModelProperty("收藏使用的商品vo")
-	private GoodsVo  goodsVo;
+	private FgResourceVo fgResourceVo;
 	@ApiModelProperty("创建时间")
 	protected String createTime;
 }