Merge remote-tracking branch 'origin/dev' into 5.X

疯狂的狮子Li

2023-12-23 2a9624d404acd466c76abdb21507748ef7b63fa5

 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);
}