Merge branch 'fixbug/fixmerge' into 'master'

bug: [none] fixUserCount

See merge request rays/pcloud-book!1079

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/ServeCollectBizImpl.java

@@ -32,6 +32,7 @@ import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.NumberUtil;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
+import com.pcloud.readercenter.rmall.enums.MoneyReceiveTypeEnum;
 import com.pcloud.resourcecenter.product.dto.ProductDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;