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

AprilWind

2024-05-25 11bfde3dc1f8fbb0bfd681e7ba35d491a4f52a06

 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java

@@ -78,5 +78,5 @@
    /**
     * 同步租户套餐
     */
    Boolean syncTenantPackage(String tenantId, String packageId);
    Boolean syncTenantPackage(String tenantId, Long packageId);
}