Merge branch 'master-chw' into dev-chw

bc68e92f · hezhen · a8447953 · 33c6b4bf · bc68e92f
Commit bc68e92f authored Nov 20, 2020 by hezhen
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ActivityMapper.xml ...ivity-server/src/main/resources/mapper/ActivityMapper.xml +2 -2

No files found.
--- a/xx-activity/xx-activity-server/src/main/resources/mapper/ActivityMapper.xml
+++ b/xx-activity/xx-activity-server/src/main/resources/mapper/ActivityMapper.xml
@@ -37,8 +37,8 @@
        t.name as typeName,
        (
        CASE
-        WHEN a.end_time >=#{time} THEN
-        a.end_time -#{time}
+        WHEN a.start_time >=#{time} THEN
+        a.start_time -#{time}
        ELSE
        0
        END