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

zhongrj

2023-06-19 a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml

@@ -38,6 +38,9 @@
        <if test="vo.operationDescription !=null and vo.operationDescription !=''">
            AND L.OPERATION_DESCRIPTION LIKE CONCAT('%',#{vo.operationDescription},'%')
        </if>
        <if test="vo.source !=null and vo.source !=''">
            AND L.SOURCE = #{vo.source}
        </if>
        ORDER BY L.CREATE_TIME DESC
    </select>
</mapper>