Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java

@@ -139,4 +139,13 @@ public class DemandRecResultDTO implements Serializable {
     private String longitude;
     // 纬度,需求人是ic的居民时，取所住楼栋的中心点位
     private String latitude;
+
+    /**
+     * 来源[需求录入:demand  事件管理:ic_event]
+     */
+    private String origin;
+    /**
+     * 来源Id[目前只有来源事件管理的有值]
+     */
+    private String originId;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -85,7 +85,9 @@
                 CASE WHEN R.DEMAND_USER_TYPE='mini_resi' THEN R.DEMAND_USER_ID
                 ELSE ''
                 END
-            ) as epmetUserId
+            ) as epmetUserId,
+            r.ORIGIN AS origin,
+            r.ORIGIN_ID AS originId
         FROM
             ic_user_demand_rec r
             left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )