Merge remote-tracking branch 'origin/dev_2.1.0' into dev_2.1.0

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java

@@ -46,6 +46,8 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
         return configPhysicalToolService.lambdaQuery().like(StrUtil.isNotBlank(toolName), ConfigPhysicalTool::getToolName, toolName)
                 .eq(StrUtil.isNotBlank(type), ConfigPhysicalTool::getType, type)
                 .eq(ObjectUtil.isNotEmpty(requireLocation), ConfigPhysicalTool::getRequireLocation, requireLocation)
+//                .orderByAsc(ConfigPhysicalTool::getTypePriority)
+                .orderByDesc(ConfigPhysicalTool::getCreateTime)
                 .page(new Page<>(pageNum, pageSize));
     }
 
@@ -110,6 +112,7 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
                 defaultPhysicalIndicatorService.saveOrUpdate(defaultPhysicalIndicator);
             }
         }
+        configPhysicalToolService.updateById(physicalToolVO);
 
 
     }