diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index f7044728..8064d0a8 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -20,15 +20,13 @@ import java.util.List;
 
 /**
  *
- * @author Philip
- * @since 2021-07-20
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 @RestController
 @RequestMapping("/Z-ABNORMAL-BILL")
 public class AbnormalBillController {
 
-
-
     @Autowired
     public AbnormalBillService abnormalBillService;
 
@@ -39,7 +37,6 @@ public class AbnormalBillController {
     private FileUploadedService fileUploadedService;
 
 
-
     /**
     * 根据id查询
     *
@@ -164,7 +161,6 @@ public class AbnormalBillController {
     }
 
 
-
     /**
      * 初始化
      * @param messageType  暂时不用
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
index b5673d56..daa9fbe1 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
@@ -13,8 +13,8 @@ import java.util.List;
  * 异常单 Mapper 接口
  * </p>
  *
- * @author Philip
- * @since 2021-07-20
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 @Repository
 public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
@@ -32,4 +32,5 @@ public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
     List<AbnormalBill> findCountBySfc(@Param("site")String site, @Param("type")String type, @Param("sfc")String sfc, @Param("status")List<String> status);
 
 
+
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
index 594115fb..c7f32b2b 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
@@ -14,8 +14,8 @@ import java.time.LocalDateTime;
  * 异常单
  * </p>
  *
- * @author Philip
- * @since 2021-07-20
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 
 @TableName("Z_ABNORMAL_BILL")
@@ -187,12 +187,12 @@ public class AbnormalBill extends Model<AbnormalBill> {
     /**
      * 提报发送用户组
      */
-   @TableField("REPORT__SEND_USER_GROUP")
+   @TableField("REPORT_SEND_USER_GROUP")
    private String reportSendUserGroup;
     /**
      * 取消发送用户组
      */
-   @TableField("CANCEL__SEND_USER_GROUP")
+   @TableField("CANCEL_SEND_USER_GROUP")
    private String cancelSendUserGroup;
     /**
      * 创建人
@@ -215,7 +215,6 @@ public class AbnormalBill extends Model<AbnormalBill> {
    @TableField("MODIFIED_DATE_TIME")
    private LocalDateTime modifiedDateTime;
 
-
    @TableField(exist = false)
    private String filePath;
 
@@ -226,6 +225,8 @@ public class AbnormalBill extends Model<AbnormalBill> {
    private String fileNum;
 
 
+
+
    public String getHandle() {
       return handle;
    }
@@ -618,9 +619,9 @@ public static final String CANCEL_DATE_TIME = "CANCEL_DATE_TIME";
 
 public static final String CANCEL_USER = "CANCEL_USER";
 
-public static final String REPORT__SEND_USER_GROUP = "REPORT__SEND_USER_GROUP";
+public static final String REPORT_SEND_USER_GROUP = "REPORT_SEND_USER_GROUP";
 
-public static final String CANCEL__SEND_USER_GROUP = "CANCEL__SEND_USER_GROUP";
+public static final String CANCEL_SEND_USER_GROUP = "CANCEL_SEND_USER_GROUP";
 
 public static final String CREATED_USER = "CREATED_USER";
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
index 6d367f9b..98b7b028 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
@@ -17,8 +17,8 @@ import java.util.List;
  * 异常单 服务类
  * </p>
  *
- * @author Philip
- * @since 2021-07-20
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 public interface AbnormalBillService extends IService<AbnormalBill> {
 
@@ -120,7 +120,7 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
      */
     String getNextNumber(String type);
 
-    HashMap<String,Object> anomalyReveseRepair(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
+    HashMap<String,Object> anomalyReveseRepair(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose);
 
 //    void deleteFileInDatabase(String ftpPath,String fileName);
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 2741b8d1..bce354c3 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -38,8 +38,8 @@ import java.util.*;
  * 异常单 服务实现类
  * </p>
  *
- * @author Philip
- * @since 2021-07-20
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -130,6 +130,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     @Autowired
     private AbnormalMessageService abnormalMessageService;
 
+
+
     @Override
     public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) {
         QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
@@ -442,7 +444,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         //设置异常单的handle
         abnormalBill.setHandle(HandleEnum.Z_ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo()));
         if(abnormalBillMapper.selectById(abnormalBill.getHandle()) != null &&
-           !Constants.SHUT_DOWN.equals(abnormalBill.getStatus())){
+                !Constants.SHUT_DOWN.equals(abnormalBill.getStatus())){
             throw BusinessException.build("该异常单已经提交，请清空后提交");
         }
         /**
@@ -493,7 +495,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             }
         }
 
-         //判断工序编码是否传递错误
+        //判断工序编码是否传递错误
         if(!StringUtil.isBlank(abnormalBill.getOperation())){
             QueryWrapper<Operation> operationQueryWrapper = new QueryWrapper<Operation>();
             operationQueryWrapper.eq("OPERATION",abnormalBill.getOperation())
@@ -884,7 +886,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
         //设置状态，新建是Y，响应为N，纠防确认是N，方案确认是Y，
         if(Constants.ABNORMAL_MESSAGE_RESPONSE.equals(abnormalMessage.getAbnormalNode()) ||
-           Constants.ABNORMAL_MESSAGE_CORRECTION_CONFIRM.equals(abnormalMessage.getAbnormalNode())){
+                Constants.ABNORMAL_MESSAGE_CORRECTION_CONFIRM.equals(abnormalMessage.getAbnormalNode())){
             abnormalMessage.setStatus("N");
         }else{
             abnormalMessage.setStatus("Y");
@@ -960,4 +962,5 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     }
 
 
+
 }
\ No newline at end of file
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index d9987bbc..7981ac8c 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -36,15 +36,14 @@
         <result column="CANCEL_REASON" property="cancelReason" />
         <result column="CANCEL_DATE_TIME" property="cancelDateTime" />
         <result column="CANCEL_USER" property="cancelUser" />
-        <result column="REPORT__SEND_USER_GROUP" property="reportSendUserGroup" />
-        <result column="CANCEL__SEND_USER_GROUP" property="cancelSendUserGroup" />
+        <result column="REPORT_SEND_USER_GROUP" property="reportSendUserGroup" />
+        <result column="CANCEL_SEND_USER_GROUP" property="cancelSendUserGroup" />
         <result column="CREATED_USER" property="createdUser" />
         <result column="CREATED_DATE_TIME" property="createdDateTime" />
         <result column="MODIFIED_USER" property="modifiedUser" />
         <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
     </resultMap>
 
-
     <resultMap id="abnormalBillDto" type="com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto" extends="BaseResultMap">
         <result column="SEQ" property="seq"/>
         <result column="ITEM_DESCRIPTION" property="itemDescription"/>
@@ -58,10 +57,9 @@
         <result column="RESOLVE_REMARK" property="resolveRemark"/>
     </resultMap>
 
-
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT__SEND_USER_GROUP, CANCEL__SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
+        HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -127,8 +125,8 @@
             <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
             <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
             <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-            <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-            <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+            <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+            <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
             <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
             <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
             <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -175,8 +173,8 @@
                 <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
                 <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
                 <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-                <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-                <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+                <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                 <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                 <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                 <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -231,8 +229,8 @@
                     <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
                     <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
                     <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -287,8 +285,8 @@
                     <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
                     <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
                     <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -343,8 +341,8 @@
                     <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
                     <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
                     <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -399,8 +397,8 @@
                     <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
                     <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
                     <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -455,8 +453,8 @@
                     <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
                     <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
                     <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -507,8 +505,8 @@
             <if test="cancelReason!=null">CANCEL_REASON,</if>
             <if test="cancelDateTime!=null">CANCEL_DATE_TIME,</if>
             <if test="cancelUser!=null">CANCEL_USER,</if>
-            <if test="reportSendUserGroup!=null">REPORT__SEND_USER_GROUP,</if>
-            <if test="cancelSendUserGroup!=null">CANCEL__SEND_USER_GROUP,</if>
+            <if test="reportSendUserGroup!=null">REPORT_SEND_USER_GROUP,</if>
+            <if test="cancelSendUserGroup!=null">CANCEL_SEND_USER_GROUP,</if>
             <if test="createdUser!=null">CREATED_USER,</if>
             <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
             <if test="modifiedUser!=null">MODIFIED_USER,</if>
@@ -637,8 +635,8 @@
         <if test="et.cancelReason!=null">CANCEL_REASON=#{et.cancelReason},</if>
         <if test="et.cancelDateTime!=null">CANCEL_DATE_TIME=#{et.cancelDateTime},</if>
         <if test="et.cancelUser!=null">CANCEL_USER=#{et.cancelUser},</if>
-        <if test="et.reportSendUserGroup!=null">REPORT__SEND_USER_GROUP=#{et.reportSendUserGroup},</if>
-        <if test="et.cancelSendUserGroup!=null">CANCEL__SEND_USER_GROUP=#{et.cancelSendUserGroup},</if>
+        <if test="et.reportSendUserGroup!=null">REPORT_SEND_USER_GROUP=#{et.reportSendUserGroup},</if>
+        <if test="et.cancelSendUserGroup!=null">CANCEL_SEND_USER_GROUP=#{et.cancelSendUserGroup},</if>
         <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
         <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
         <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
@@ -680,8 +678,8 @@
         CANCEL_REASON=#{et.cancelReason},
         CANCEL_DATE_TIME=#{et.cancelDateTime},
         CANCEL_USER=#{et.cancelUser},
-        REPORT__SEND_USER_GROUP=#{et.reportSendUserGroup},
-        CANCEL__SEND_USER_GROUP=#{et.cancelSendUserGroup},
+        REPORT_SEND_USER_GROUP=#{et.reportSendUserGroup},
+        CANCEL_SEND_USER_GROUP=#{et.cancelSendUserGroup},
         CREATED_USER=#{et.createdUser},
         CREATED_DATE_TIME=#{et.createdDateTime},
         MODIFIED_USER=#{et.modifiedUser},
@@ -723,8 +721,8 @@
         <if test="et.cancelReason!=null">CANCEL_REASON=#{et.cancelReason},</if>
         <if test="et.cancelDateTime!=null">CANCEL_DATE_TIME=#{et.cancelDateTime},</if>
         <if test="et.cancelUser!=null">CANCEL_USER=#{et.cancelUser},</if>
-        <if test="et.reportSendUserGroup!=null">REPORT__SEND_USER_GROUP=#{et.reportSendUserGroup},</if>
-        <if test="et.cancelSendUserGroup!=null">CANCEL__SEND_USER_GROUP=#{et.cancelSendUserGroup},</if>
+        <if test="et.reportSendUserGroup!=null">REPORT_SEND_USER_GROUP=#{et.reportSendUserGroup},</if>
+        <if test="et.cancelSendUserGroup!=null">CANCEL_SEND_USER_GROUP=#{et.cancelSendUserGroup},</if>
         <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
         <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
         <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
@@ -765,8 +763,8 @@
                     <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
                     <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
                     <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -838,8 +836,8 @@
                     <if test="ew.entity.cancelReason!=null"> AND CANCEL_REASON=#{ew.entity.cancelReason}</if>
                     <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
                     <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
-                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT__SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
-                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL__SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
+                    <if test="ew.entity.reportSendUserGroup!=null"> AND REPORT_SEND_USER_GROUP=#{ew.entity.reportSendUserGroup}</if>
+                    <if test="ew.entity.cancelSendUserGroup!=null"> AND CANCEL_SEND_USER_GROUP=#{ew.entity.cancelSendUserGroup}</if>
                     <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
@@ -957,4 +955,5 @@
         </where>
     </select>
 
+
 </mapper>