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

AprilWind

2024-05-27 1bd40a0cff850e1c6dd41c6c606d48d31b9b76f6

 ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -8,6 +8,7 @@
#if($IsTenant==1)
import org.dromara.common.tenant.core.TenantEntity;
#else
import org.dromara.common.mybatis.core.domain.BaseEntity;
#end
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;