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

guoshilong

2023-07-06 390eb925034c3f6dea83fc7ce2378ea40a93053d

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesMapper.java

@@ -1,6 +1,5 @@
package cn.gistack.sm.resDataCheck.mapper;

import cn.gistack.sm.patrol.entity.PatrolConfig;
import cn.gistack.sm.resDataCheck.entity.Rules;
import cn.gistack.sm.resDataCheck.vo.RulesVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;