Merge remote-tracking branch 'origin/dev_ic_mp' into develop

4 years ago · d53f70f444
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@ -257,7 +257,7 @@
        ) as serviceName,
        s.SERVICE_START_TIME as serviceStartTime,
        s.SERVICE_END_TIME as serviceEndTime,
-        IFNULL(s.remark,'') as  finishDesc,
+        IFNULL(sa.remark,'') as  finishDesc,
        '' AS serviceShowName,
        s.id as serviceId,
        (