elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev
yinzuomei 4 years ago
parent
b68ac17277 759c42050e
commit
d53f70f444
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

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

@ -257,7 +257,7 @@
) as serviceName, ) as serviceName,
s.SERVICE_START_TIME as serviceStartTime, s.SERVICE_START_TIME as serviceStartTime,
s.SERVICE_END_TIME as serviceEndTime, s.SERVICE_END_TIME as serviceEndTime,
IFNULL(s.remark,'') as finishDesc, IFNULL(sa.remark,'') as finishDesc,
'' AS serviceShowName, '' AS serviceShowName,
s.id as serviceId, s.id as serviceId,
( (

Write Preview
Loading…
Cancel
Save