Merge branch 'yantai_zhengwu_master'

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml

@@ -31,7 +31,8 @@
             d.IC_RESI_USER_ID,
             d.NAME AS name,d.ID_CARD,
             if(d.MARITAL_STATUS_NAME = 'IA:结婚','结婚',if(d.MARITAL_STATUS_NAME = 'IB:离婚','离婚','单身')) as maritalStatus,
-            if(d.DEAL_STATUS = 0,'未处理',if(d.DEAL_STATUS = 1,'已处理',''))  as dealStatusName,
+            d.DEAL_STATUS,
+            if(d.DEAL_STATUS = 0,'未处理',if(d.DEAL_STATUS = 1,'处理成功',if(d.DEAL_STATUS = 2,'处理失败','')))  as dealStatusName,
             d.DEAL_RESULT
         from
             data_sync_record_marital d