diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index c2d99f1d..7cef038e 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -150,6 +150,7 @@ public class OrderController extends BaseController {
         od.setRevTime(om.getRevTime());
         od.setExpectTimeStart(om.getExpectTimeStart());
         od.setExpectTimeEnd(om.getExpectTimeEnd());
+        od.setRemark(om.getRemark());
         orderDetailService.insertOrderDetail(od);
 
         // 批量生成订单商品
@@ -246,6 +247,7 @@ public class OrderController extends BaseController {
         orderMaster.setCreateTime(new Date());
         orderMaster.setWorkerId(goods.getWorkerId());
 //        orderMaster.setRevTime(DateUtils.parseDate(appOrderRequest.getServerTime(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
+        orderMaster.setRemark(appOrderRequest.getRemark());
         orderMaster.setExpectTimeStart(DateUtils.parseDate(appOrderRequest.getExpectTimeStart(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
         orderMaster.setExpectTimeEnd(DateUtils.parseDate(appOrderRequest.getExpectTimeEnd(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
         orderMasterService.insertOrderMaster(orderMaster);
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index 9155dd30..5aa7d141 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -151,6 +151,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setCreateTime(detail.getCreateTime());
             orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
+            orderListResponse.setRemark(goods.getRemark());
+            orderListResponse.setCustomerRemark(orderMaster.getRemark());
 
             return AjaxResult.success(orderListResponse);
         }catch (Exception e){
@@ -229,6 +231,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
             orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
+            orderListResponse.setRemark(goods.getRemark());
+            orderListResponse.setCustomerRemark(orderMaster.getRemark());
             orderListResponses.add(orderListResponse);
         });
         return voDataTable(orderListResponses, list);
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index d1044f14..7f99115b 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -148,6 +148,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setOrderMasterCode(master.getCode());
             orderListResponse.setStandardList(standardList);
             orderListResponse.setAddress(customerAddress.getAddress());
+            orderListResponse.setRemark(goods.getRemark());
+            orderListResponse.setCustomerRemark(master.getRemark());
             orderListResponses.add(orderListResponse);
 
         });
@@ -248,7 +250,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd());
             orderListResponse.setCreateTime(orderMaster.getCreateTime());
-            orderListResponse.setRemark(orderMaster.getRemark());
+            orderListResponse.setRemark(goods.getRemark());
+            orderListResponse.setCustomerRemark(orderMaster.getRemark());
             orderListResponse.setOrderStandardDetailList(orderStandardDetails);
 
             return AjaxResult.success(orderListResponse);
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 880b8e83..04a4e74b 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -1,12 +1,10 @@
 package com.ghy.web.pojo.vo;
 
-import com.ghy.order.domain.OrderDetail;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Data
 public class OrderListResponse {
@@ -27,6 +25,8 @@ public class OrderListResponse {
 
     private String customerPhone;
 
+    private String customerRemark;
+
     private Date serverTime;
 
     private Date expectTimeStart;
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index 056b83c6..f7d75f7d 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -117,6 +117,7 @@
         <if test="orderStatus != null">order_status,</if>
         <if test="workerId != null and workerId != 0">worker_id,</if>
         <if test="revTime != null">rev_time,</if>
+        <if test="remark != null">remark,</if>
         <if test="expectTimeStart != null">expect_time_start,</if>
         <if test="expectTimeEnd != null">expect_time_end,</if>
         <if test="workBeginTime != null">work_begin_time,</if>
@@ -132,6 +133,7 @@
         <if test="orderStatus != null">#{orderStatus},</if>
         <if test="workerId != null and workerId != 0">#{workerId},</if>
         <if test="revTime != null">#{revTime},</if>
+        <if test="remark != null">#{remark},</if>
         <if test="expectTimeStart != null">#{expectTimeStart},</if>
         <if test="expectTimeEnd != null">#{expectTimeEnd},</if>
         <if test="workBeginTime != null">#{workBeginTime},</if>
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 6f0cd6fe..70dfa0fd 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -130,6 +130,7 @@
         <if test="workerId != null and workerId != 0">worker_id,</if>
         <if test="payTime != null">pay_time,</if>
         <if test="revTime != null">rev_time,</if>
+        <if test="remark != null">remark,</if>
         <if test="expectTimeStart != null">expect_time_start,</if>
         <if test="expectTimeEnd != null">expect_time_end,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
@@ -146,6 +147,7 @@
         <if test="workerId != null and workerId != 0">#{workerId},</if>
         <if test="payTime != null">#{payTime},</if>
         <if test="revTime != null">#{revTime},</if>
+        <if test="remark != null">#{remark},</if>
         <if test="expectTimeStart != null">#{expectTimeStart},</if>
         <if test="expectTimeEnd != null">#{expectTimeEnd},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
index d2ebb195..c73050ff 100644
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
@@ -54,5 +54,7 @@ public class Worker extends BaseEntity {
     @Excel(name = "领导团队扣费金额", cellType = Excel.ColumnType.STRING)
     private String leaderTeamMoney;
 
+    private String bannerUrl;
+
     private List<Long> workerIds;
 }
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
index aea0247a..878cacec 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
@@ -21,14 +21,16 @@
         <result property="updateBy"            column="update_by"     />
         <result property="updateTime"          column="update_time"   />
         <result property="remark"              column="remark"        />
+        <result property="bannerUrl"           column="banner_url"></result>
     </resultMap>
 
     <sql id="selectWorker">
         SELECT
-            w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, sd.dept_name, w.status, w.worker_logo_url,
+            w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, sd.dept_name, sdc.banner_url, w.status, w.worker_logo_url,
             w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, w.remark, w.type
         FROM worker w
         LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id
+        LEFT JOIN sys_dept_config sdc ON w.dept_id = sdc.dept_id
     </sql>
 
     <select id="getWorkerList" parameterType="com.ghy.worker.domain.Worker" resultMap="WorkerResult">