版本合并

zengh

2021-06-01 cd2cfd37366002f790a2ed1435962d4eff7d5cec

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml

@@ -237,10 +237,10 @@
    <!--导出健康码数据表格-->
    <select id="exportHealthcode" resultType="org.springblade.common.entity.HealthcodeExcel">
        SELECT * FROM healthcode
        where 1=1
        <if test="healthcodeVO.type!=null and healthcodeVO.type!='undefined' ">
            and type=#{healthcodeVO.type}
        </if>
        where 1=1
            <include refid="detailCondition"></include>
        ORDER BY dtime desc
    </select>