diff --git a/doc/设计文档/数据库设计/mes-pro.sql b/doc/设计文档/数据库设计/mes-pro.sql
index 8360af8..c2c7a37 100644
--- a/doc/设计文档/数据库设计/mes-pro.sql
+++ b/doc/设计文档/数据库设计/mes-pro.sql
@@ -292,6 +292,7 @@ create table pro_feedback (
   item_id                        bigint(20)      not null                   comment '产品物料ID',
   item_code                      varchar(64)     not null                   comment '产品物料编码',
   item_name                      varchar(255)    not null                   comment '产品物料名称',
+  unit_of_measure                varchar(64)                                comment '单位',
   specification                  varchar(500)                               comment '规格型号',
   quantity                       double(14,2)                               comment '排产数量',
   quantity_feedback              double(14,2)                               comment '本次报工数量',
@@ -302,6 +303,7 @@ create table pro_feedback (
   feedback_channel               varchar(64)                                comment '报工途径',
   feedback_time                  datetime                                   comment '报工时间',
   record_user                    varchar(64)                                comment '记录人',
+  record_nick                    varchar(64)                                comment '记录人名称',
   status                         varchar(64)     default 'PREPARE'          comment '状态',
   remark                         varchar(500)    default ''                 comment '备注',
   attr1                          varchar(64)     default null               comment '预留字段1',
diff --git a/doc/设计文档/数据库设计/数据库设计.xlsx b/doc/设计文档/数据库设计/数据库设计.xlsx
index 2918bb4..e695fce 100644
Binary files a/doc/设计文档/数据库设计/数据库设计.xlsx and b/doc/设计文档/数据库设计/数据库设计.xlsx differ
diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java
index 1ded6db..84b8e15 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java
@@ -110,10 +110,14 @@ public class ProFeedback extends BaseEntity
     @Excel(name = "报工时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date feedbackTime;
 
-    /** 录入人员 */
-    @Excel(name = "录入人员")
+    /** 审批人员 */
+    @Excel(name = "审批人员")
     private String recordUser;
 
+    /** 审批人员名称 */
+    @Excel(name = "审批人员名称")
+    private String recordNick;
+
     /** 状态 */
     @Excel(name = "状态")
     private String status;
@@ -384,6 +388,14 @@ public class ProFeedback extends BaseEntity
         this.status = status;
     }
 
+    public String getRecordNick() {
+        return recordNick;
+    }
+
+    public void setRecordNick(String recordNick) {
+        this.recordNick = recordNick;
+    }
+
     @Override
     public String toString() {
         return "ProFeedback{" +
@@ -411,6 +423,7 @@ public class ProFeedback extends BaseEntity
                 ", feedbackChannel='" + feedbackChannel + '\'' +
                 ", feedbackTime=" + feedbackTime +
                 ", recordUser='" + recordUser + '\'' +
+                ", recordNick='" + recordNick + '\'' +
                 ", status='" + status + '\'' +
                 ", attr1='" + attr1 + '\'' +
                 ", attr2='" + attr2 + '\'' +
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
index 16bff17..61fed13 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ProFeedback" id="ProFeedbackResult">
         <result property="recordId"    column="record_id"    />
+        <result property="feedbackType"    column="feedback_type"    />
         <result property="workstationId"    column="workstation_id"    />
         <result property="workstationCode"    column="workstation_code"    />
         <result property="workstationName"    column="workstation_name"    />
@@ -27,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="feedbackChannel"    column="feedback_channel"    />
         <result property="feedbackTime"    column="feedback_time"    />
         <result property="recordUser"    column="record_user"    />
+        <result property="recordNick"    column="record_nick" />
         <result property="status"    column="status"    />
         <result property="remark"    column="remark"    />
         <result property="attr1"    column="attr1"    />
@@ -40,13 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProFeedbackVo">
-        select record_id, workstation_id, workstation_code, workstation_name, workorder_id, workorder_code, workorder_name, task_id, task_code,item_id,item_code,item_name,specification,unit_of_measure, quantity, quantity_feedback, quantity_qualified, quantity_unquanlified, user_name, nick_name, feedback_channel, feedback_time,record_user,status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_feedback
+        select record_id,feedback_type, workstation_id, workstation_code, workstation_name, workorder_id, workorder_code, workorder_name, task_id, task_code,item_id,item_code,item_name,specification,unit_of_measure, quantity, quantity_feedback, quantity_qualified, quantity_unquanlified, user_name, nick_name, feedback_channel, feedback_time,record_user,record_nick,status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_feedback
     </sql>
 
     <select id="selectProFeedbackList" parameterType="ProFeedback" resultMap="ProFeedbackResult">
         <include refid="selectProFeedbackVo"/>
         <where>  
             <if test="workstationId != null "> and workstation_id = #{workstationId}</if>
+            <if test="feedbackType !=null "> and feedback_type = #{feedbackType}</if>
             <if test="workstationCode != null  and workstationCode != ''"> and workstation_code = #{workstationCode}</if>
             <if test="workstationName != null  and workstationName != ''"> and workstation_name like concat('%', #{workstationName}, '%')</if>
             <if test="workorderId != null "> and workorder_id = #{workorderId}</if>
@@ -68,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feedbackChannel != null  and feedbackChannel != ''"> and feedback_channel = #{feedbackChannel}</if>
             <if test="feedbackTime != null "> and feedback_time = #{feedbackTime}</if>
             <if test="recordUser != null "> and record_user = #{recordUser}</if>
+            <if test="recordNick != null "> and record_nick = #{recordNick}</if>
             <if test="status != null "> and status = #{status}</if>
         </where>
     </select>
@@ -80,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertProFeedback" parameterType="ProFeedback" useGeneratedKeys="true" keyProperty="recordId">
         insert into pro_feedback
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="feedbackType !=null ">feedback_type,</if>
             <if test="workstationId != null">workstation_id,</if>
             <if test="workstationCode != null">workstation_code,</if>
             <if test="workstationName != null">workstation_name,</if>
@@ -102,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feedbackChannel != null">feedback_channel,</if>
             <if test="feedbackTime != null">feedback_time,</if>
             <if test="recordUser != null">record_user,</if>
+            <if test="recordNick != null ">record_nick,</if>
             <if test="status != null">status,</if>
             <if test="remark != null">remark,</if>
             <if test="attr1 != null">attr1,</if>
@@ -114,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="feedbackType !=null ">#{feedbackType},</if>
             <if test="workstationId != null">#{workstationId},</if>
             <if test="workstationCode != null">#{workstationCode},</if>
             <if test="workstationName != null">#{workstationName},</if>
@@ -136,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feedbackChannel != null">#{feedbackChannel},</if>
             <if test="feedbackTime != null">#{feedbackTime},</if>
             <if test="recordUser != null">#{recordUser},</if>
+            <if test="recordNick != null ">#{recordNick},</if>
             <if test="status != null">#{status},</if>
             <if test="remark != null">#{remark},</if>
             <if test="attr1 != null">#{attr1},</if>
@@ -152,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateProFeedback" parameterType="ProFeedback">
         update pro_feedback
         <trim prefix="SET" suffixOverrides=",">
+            <if test="feedbackType !=null ">feedback_type = #{feedbackType},</if>
             <if test="workstationId != null">workstation_id = #{workstationId},</if>
             <if test="workstationCode != null">workstation_code = #{workstationCode},</if>
             <if test="workstationName != null">workstation_name = #{workstationName},</if>
@@ -174,6 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feedbackChannel != null">feedback_channel = #{feedbackChannel},</if>
             <if test="feedbackTime != null">feedback_time = #{feedbackTime},</if>
             <if test="recordUser != null">record_user = #{recordUser},</if>
+            <if test="recordNick != null ">record_nick = #{recordNick},</if>
             <if test="status != null">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="attr1 != null">attr1 = #{attr1},</if>