提交

@@ -120,7 +120,6 @@ module.exports = {
                         result = { code: 400, message: "该用户没有店铺" };
                     }
                     return callback(null, result);
-<<<<<<< HEAD
                 },errcallback);
             }, errcallback);
         },
@@ -135,12 +134,6 @@ module.exports = {
             }
         },
         gray: function (req, callback,common) {
-=======
-                }
-	        });
- 		},
-        gray: function (req, callback){
->>>>>>> master
             var result = { code: 201, message: "没有权限" };
             if (req.session && req.session.user) {
                 var user = req.session.user;