Merge branch 'dev'

ageerle

2025-04-21 69efc3261e6f6e4dca268fb2de9866d8f2a14952

 ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/GenTable.java

@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import org.ruoyi.generator.constant.GenConstants;
import org.ruoyi.common.core.utils.StringUtils;
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
import org.ruoyi.core.domain.BaseEntity;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;