# Conflicts:
#	pcloud-service-book/pom.xml

# Conflicts:
#	pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBiz.java
#	pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
#	pcloud-service-book/src/main/java/com/pcloud/book/group/constant/ResourcePageConstants.java
#	pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/ResourcePageFacade.java

feat:[1005260]小睿H5关注公众号弹窗

See merge request rays/pcloud-book!1396

bug:[1030717]资源配置

See merge request rays/pcloud-book!1395

bug: [none] sql异常

See merge request rays/pcloud-book!1394

bug: [1005354] 生产error处理

See merge request rays/pcloud-book!1393

feat:[1005330]导航分成互助打卡

See merge request rays/pcloud-book!1392

Merge branches '3.x' and 'feature/1005260' of http://begitlab.chubanyun.me/rays/pcloud-book into 3.x

bug:[none]H5导航

See merge request rays/pcloud-book!1391

bug:[none]H5导航

See merge request rays/pcloud-book!1390

feat: [1005314] 编辑运营需求（版权保护支付、应用有效期）

See merge request rays/pcloud-book!1389

feat:[1005240]本书服务页加导航

See merge request rays/pcloud-book!1388

feat: [1005183] 编辑端新增图书售卖服务

See merge request rays/pcloud-book!1387