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/feign/RulesClient.java

@@ -237,6 +237,7 @@

      }

      // 拼接条件有问题，不操作
      if (sqlStr.indexOf("-1") > 0) {
         return R.fail(-1,sqlStr + "\\n 查询条件错误，请检查规则设置");
      }