Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei/www/controller/unlimited/EncyclopediaController.java

@@ -134,7 +134,8 @@ public class EncyclopediaController extends BaseController {
     public String getMoreList(final Model model, @PathVariable("typeId") Integer typeId, @PathVariable("pageNum") Integer pageNum, @PathVariable("pageSize") Integer pageSize) {
         BaikeType baikeType = productService.getBaikeType(typeId);
         Map<String, Object> moreData = productService.getBaikeMoreJson(typeId, pageNum, pageSize);
-        model.addAttribute("typeName", baikeType.getName());
+        moreData.put("typeId", typeId);
+        moreData.put("typeName", baikeType.getName());
         model.addAttribute("moreData", moreData);
         // 搜索热门关键字
         List<BaikeHotSearch> searchHotWord = baseService.getBaikeSearchHotWord();