Authored by chunhua.zhang

Merge branch 'master' of git.yoho.cn:yoho-documents/api-interfaces

Conflicts:
	market/广点通商品库.md
... ... @@ -30,7 +30,7 @@
<!-- 折扣信息 -->
<discountInfo><![CDATA[5折起]]></discountInfo>
<!--风格-->
<style><![CDATA[运动]]></style>
... ... @@ -38,11 +38,11 @@
<!--图案纹理-->
<texture><![CDATA[条纹]]></texture>
<!-- 品类信息 -->
<!-- 品类信息 -->
<gender><![CDATA[男生]]></gender>
<category><![CDATA[上衣]]></category>
<category><![CDATA[上衣]]></category>
<subCategory><![CDATA[羽绒服]]></subCategory>
<thirdCategory><![CDATA[羽绒服]]></thirdCategory>
... ...