Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java

@@ -42,9 +42,8 @@ public class RayInsStatusTask {
                 //当原本状态为null或非终止态时才调用argo接口
                 try {
                     rayIns = rayInsService.queryStatusFromArgo(rayIns);
-                    Ray ray = rayDao.getRayById(rayIns.getRayId());
                     // 扣除积分
-                    if (Constant.Running.equals(rayIns.getStatus()) && resourceOccupyService.haveResource(ray.getComputingResourceId(), 1)) {
+                    if (Constant.Running.equals(rayIns.getStatus())) {
                         resourceOccupyService.deducing(Constant.TaskType_Ray, null, rayIns.getId(), null, null);
                     } else if (Constant.Failed.equals(rayIns.getStatus()) || Constant.Terminated.equals(rayIns.getStatus())
                             || Constant.Succeeded.equals(rayIns.getStatus())) {