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

cds-fontend-2025.V1/src/views/tenant/tenant/modules/tenant-operate-drawer.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, reactive, ref, watch } from 'vue';
-import { useLoading } from '@sa/hooks';
+import { useLoading } from '~/packages/hooks';
 import { fetchCreateTenant, fetchUpdateTenant } from '@/service/api/system/tenant';
 import { fetchGetTenantPackageSelectList } from '@/service/api/system/tenant-package';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';

cds-platform-2025.V1/script/bin/cds.bat

@@ -5,7 +5,7 @@ rem jar平级目录
 set AppName=mps-server.jar
 
 rem JVM参数
-set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms2048m -Xmx4096m -XX:MetaspaceSize=512m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC --Djasypt.encryptor.password=66668888"
+set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms2048m -Xmx4096m -XX:MetaspaceSize=512m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC -Djasypt.encryptor.password=66668888"
 
 
 ECHO.

cds-platform-2025.V1/script/bin/cds.sh

@@ -3,7 +3,7 @@
 AppName=mps-server.jar
 
 # JVM参数
-JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms2048m -Xmx4096m -XX:MetaspaceSize=512m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC --Djasypt.encryptor.password=66668888"
+JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms2048m -Xmx4096m -XX:MetaspaceSize=512m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC -Djasypt.encryptor.password=66668888"
 APP_HOME=`pwd`
 LOG_PATH=$APP_HOME/logs/$AppName.log