Merge branch 'dev-xym-add-special' of Server/growth-manager into master

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/vo/WeComUserVo.java

@@ -29,4 +29,6 @@ public class WeComUserVo {
 
     private Long sendTime;
 
+    private Long sendMsgResultId;
+
 }

common-module/src/main/resources/mapper/ext/WeComUserMapperExt.xml

@@ -24,7 +24,7 @@
         select wcu.corp_id as corpId, wcu.external_user_id as externalUserId, wcu.union_id as unionId,
         wcu.external_user_id_3rd_party as externalUserId3rdParty, wcu.type as type, wcu.name as name,
         wcu.avatar as avatar, wcu.gender as gender, wcs.carrier_id as carrierId, wcsmr.status as status,
-        UNIX_TIMESTAMP(wcsmr.send_time) * 1000 as sendTime
+        UNIX_TIMESTAMP(wcsmr.send_time) * 1000 as sendTime, wcsmr.id as sendMsgResultId
         from we_com_user wcu
         join we_com_send_msg_result wcsmr on wcsmr.user_id = wcu.id
         join we_com_special_send_message wcssm on wcssm.user_id = wcsmr.user_id and wcssm.staff_id = wcsmr.staff_id