Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml

@@ -922,7 +922,6 @@
               oi.pguid,
               oi.guid,
               oi.pid,
               oi.opercheck_flag,
               oi.long_task_reason,
               oi.last_Update_Time
        from HEALTHY_PAT_MED_OPERATION_ITEM oi