update:解决冲突

server/controllers/groupmeal.js

@@ -11,7 +11,6 @@ exports.getOrderList = async ctx => {
     ctx.body = await req(ctx, opts);
 };
 
-<<<<<<< Updated upstream
 // 获取主页配送列表
 exports.getList = async ctx => {
     const opts = {
@@ -52,7 +51,6 @@ exports.getSaveDeliverer = async ctx => {
     };
     ctx.body = await req(ctx, opts);
 };
-=======
 // 获取活动名称
 exports.getMarketingList = async ctx => {
     const url = `${GROUPMEAL_URI}/order/background/marketing_list`;
@@ -83,4 +81,3 @@ exports.getSubShopList = async ctx => {
     ctx.body = await req(ctx, opts);
 };
   
->>>>>>> Stashed changes

src/service/Groupmeal/groupmeal.js

@@ -5,7 +5,6 @@ export async function getList (params) {
     const res = await axios.post("/api/v1/order/deliverer/list_day_deliverer_conf",{params});
     return res;
   }
-<<<<<<< Updated upstream
 // 获取分配配送员列表
 export async function getDelivererList (params) {
     const res = await axios.post("/api/v1/order/deliverer/list_day_deliverer",params);
@@ -21,7 +20,6 @@ export async function getSaveDeliverer (params) {
     const res = await axios.post("/api/v1/order/deliverer/save_day_deliverer",params);
     return res;
 }
-=======
  
 // 获取订单列表  
 export async function getOrderList (params) {
@@ -50,4 +48,3 @@ export async function getSubShopList() {
   const res = await axios.get("/api/v1/order/background/sub_shop_list");
   return res;
 }
->>>>>>> Stashed changes