fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by ZhongW
Commit f210d85ffd2039e6a9d4e55832428aebb9276245 2 parents 403c3052 d34f87f4

Merge branch 'dev_2.2' of http://git.yoho.cn/fe/yohobuy-shop-fe2 into dev_2.2 

# Conflicts:
#	code/static/js.jquery/module/shop/ShopCategory/Edit.js
Inline Side-by-side
Showing 1 changed file with 0 additions and 1 deletions
... ... @@ -26,7 +26,6 @@ var g1 = new common.grid({
} else {
return '';
}
}},
{display: "SKN", name: "productSKN"},
{display: "厂家编号", name: "factoryCode"},
... ...