fe / yoho-shop-manage · Commits

Go to a project

Authored by htoooth
Commit bdb60402095d8b32d9c743de858ee833d605b2aa 2 parents 9d9ebc09 51dc8c59

Merge branch 'release/2.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/2.0

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
... ... @@ -162,7 +162,7 @@
values.endTime = '';
}
values.isOvertime = ot === -1 ? '' : (ot === 1 ? 'N' : 'Y'); // eslint-disable-line
values.isOvertime = ot ? (ot === 1 ? 'N' : 'Y') : ''; // eslint-disable-line
return values;
},
... ...
{
"name": "yoho-shop-manage",
"version": "1.0.12",
"version": "1.0.13",
"description": "",
"main": "app.js",
"scripts": {
... ...