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

guoshilong

2023-06-25 d5513e33f3eeee24ea0b97ecead67375245b85e3

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

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

@@ -41,6 +41,9 @@
        <if test="vo.source !=null and vo.source !=''">
            AND L.SOURCE = #{vo.source}
        </if>
        <if test="vo.daterange.length >  0">
            AND L.CREATE_TIME &gt;= #{vo.daterange[0]} AND L.CREATE_TIME &lt;= #{vo.daterange[1]}
        </if>
        ORDER BY L.CREATE_TIME DESC
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/vo/SmLogManageVO.java

@@ -9,4 +9,6 @@
     * 访问人
     */
    private String createUserName;

    private String [] daterange;
}