zhongrj
2023-07-06 5191f3f0ed2d8b291d1241b9f7f438e36e20d8cf
Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
2 files modified
1 files deleted
133 ■■■■■ changed files
data/applogs/xxl-job/xxl-job-admin.log 131 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml 1 ●●●● patch | view | raw | blame | history
data/applogs/xxl-job/xxl-job-admin.log
File was deleted
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 查询条件错误,请检查规则设置");
        }
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
@@ -31,6 +31,7 @@
        WHERE a."user_phone" = b.PHONE
          and a."res_guid" = c."guid"
          and a."type" = 5
          and c."interior_ad_guid" like '421303%'
    </select>
    <update id="updateResManagePersonByGuid">