代码合并冲突解决
This commit is contained in:
@@ -636,7 +636,13 @@
|
||||
"pageId": "PAGES_MARKET_DISTRIBUTION_INDEX",
|
||||
"path": "distribution/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "分销"
|
||||
"navigationBarTitleText": "分销"}
|
||||
},
|
||||
{
|
||||
"pageId": "PAGES_LIMIT_DISCOUNT_ADD",
|
||||
"path": "limitDiscount/add",
|
||||
"style": {
|
||||
"navigationBarTitleText": "添加限时折扣"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user