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

101captain

2022-05-06 b54d8a00d5ef8198cdf39d23b25f0254081327cf

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

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidDangerMemberMapper.xml

@@ -44,7 +44,7 @@
            and checkTime >= #{commonPage.startTime}
        </if>
        <if test="commonPage.stopTime!=null">
            and  concat(#{commonPage.stopTime},' 23:59:59') >= checkTime
            and  concat(SUBSTR(#{commonPage.stopTime} FROM 1 FOR 10),' 23:59:59') >= checkTime
        </if>
        order by checkTime desc
    </select>