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

peng

4 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 framework/src/main/resources/mapper/lmk/ActivityMapper.xml

@@ -241,10 +241,17 @@
            LA.activity_location,
            LA.activity_content
        FROM
            lmk_activity LA inner join lmk_activity_audit_record LAAR ON LA.id = LAAR.activity_id and LAAR.delete_flag = 0 and LAAR.audit = 1
            lmk_activity LA
        WHERE
            LA.delete_flag = 0
          AND LA.publish = 1
          AND EXISTS (
            SELECT 1
            FROM lmk_activity_audit_record LAAR
            WHERE LA.id = LAAR.activity_id
              AND LAAR.delete_flag = 0
              AND LAAR.audit = 1
        )
    </select>