Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-15 15041c37e21f29bb37acd5efd4ec1b9bba657c65

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java

@@ -4,14 +4,18 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author zhibing.pu
 * @Date 2024/8/8 11:55
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_region")
@ApiModel(value="Region对象", description="")
public class Region {
   /**
    * 主键