Authored by Feng

handle merge

@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 'use strict'; 7 'use strict';
8 const library = '../../../library'; 8 const library = '../../../library';
9 const mRoot = '../models'; 9 const mRoot = '../models';
10 -//const cookie = require(`${library}/cookie`); 10 +
  11 +// const cookie = require(`${library}/cookie`);
11 const headerModel = require('../../../doraemon/models/header'); 12 const headerModel = require('../../../doraemon/models/header');
12 const log = require(`${library}/logger`); 13 const log = require(`${library}/logger`);
13 const saleModel = require(`${mRoot}/sale`); 14 const saleModel = require(`${mRoot}/sale`);