Merge branch 'master' of git.yoho.cn:yoho-documents/api-interfaces
Conflicts: market/广点通商品库.md
Showing
1 changed file
with
4 additions
and
4 deletions
@@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
30 | 30 | ||
31 | <!-- 折扣信息 --> | 31 | <!-- 折扣信息 --> |
32 | <discountInfo><![CDATA[5折起]]></discountInfo> | 32 | <discountInfo><![CDATA[5折起]]></discountInfo> |
33 | - | 33 | + |
34 | 34 | ||
35 | <!--风格--> | 35 | <!--风格--> |
36 | <style><![CDATA[运动]]></style> | 36 | <style><![CDATA[运动]]></style> |
@@ -38,11 +38,11 @@ | @@ -38,11 +38,11 @@ | ||
38 | <!--图案纹理--> | 38 | <!--图案纹理--> |
39 | <texture><![CDATA[条纹]]></texture> | 39 | <texture><![CDATA[条纹]]></texture> |
40 | 40 | ||
41 | + | ||
41 | 42 | ||
42 | - | ||
43 | - <!-- 品类信息 --> | 43 | + <!-- 品类信息 --> |
44 | <gender><![CDATA[男生]]></gender> | 44 | <gender><![CDATA[男生]]></gender> |
45 | - <category><![CDATA[上衣]]></category> | 45 | + <category><![CDATA[上衣]]></category> |
46 | <subCategory><![CDATA[羽绒服]]></subCategory> | 46 | <subCategory><![CDATA[羽绒服]]></subCategory> |
47 | <thirdCategory><![CDATA[羽绒服]]></thirdCategory> | 47 | <thirdCategory><![CDATA[羽绒服]]></thirdCategory> |
48 | 48 |
-
Please register or login to post a comment