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

guoshilong

2023-06-21 b37bdc2060e6bd7bf8cb2b2d844fe45a549d210a

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml

@@ -150,8 +150,7 @@
            order by "user_phone") a) a
            ) b
        set
            a.role_id = b.role_id,
            -- a.dept_id = case b.role_id when '1642713427301355522' then cast(b."ad_code" as bigint) + 1 else b."ad_code" end
            a.role_id = b.role_id
        where a.phone = b."user_phone" and a.role_id <> b.role_id
    </update>