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

guoshilong

2023-07-05 abaf72a337248943e037b02d069c094e2ee5d60b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesConditionServiceImpl.java

@@ -17,4 +17,9 @@
   public IPage<RulesCondition> selectRulesConditionPage(IPage<RulesCondition> page, RulesCondition rulesCondition) {
      return page.setRecords(baseMapper.selectRulesConditionPage(page,rulesCondition));
   }

   @Override
   public boolean physicDelete(Long id) {
      return baseMapper.physicDelete(id);
   }
}