From 27be613f1844e2d3da825681ab8141cc1064b76f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 八月 2024 17:04:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java
index feedd52..5bace65 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java
@@ -4,7 +4,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.web.domain.BasePojo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -20,166 +22,200 @@
 	 * 主键
 	 */
 	@TableId(value = "id", type = IdType.AUTO)
+	@ApiModelProperty(value = "站点id")
 	private Integer id;
 	/**
 	 * 合作商id
 	 */
 	@TableField("partner_id")
+	@ApiModelProperty(value = "合作商id", required = true)
 	private Integer partnerId;
 	/**
 	 * 站点编号
 	 */
 	@TableField("code")
+	@ApiModelProperty(value = "站点编号", required = true)
 	private String code;
 	/**
 	 * 站点名称
 	 */
 	@TableField("name")
+	@ApiModelProperty(value = "站点名称", required = true)
 	private String name;
 	/**
 	 * 站点类型(0=其他,1=公共,2=个人,3=公交(专业),4=环卫(专用),5=物流(专用),6=出租车(专用))
 	 */
 	@TableField("site_type")
+	@ApiModelProperty(value = "站点类型(0=其他,1=公共,2=个人,3=公交(专业),4=环卫(专用),5=物流(专用),6=出租车(专用))", required = true)
 	private Integer siteType;
 	/**
 	 * 经营类型(1=直营,2=非直营)
 	 */
 	@TableField("business_category")
+	@ApiModelProperty(value = "经营类型(1=直营,2=非直营)", required = true)
 	private Integer businessCategory;
 	/**
 	 * 站点状态(1=正常使用,2=维修中,3=关闭下线)
 	 */
 	@TableField("status")
+	@ApiModelProperty(value = "站点状态(1=正常使用,2=维修中,3=关闭下线)", required = true)
 	private Integer status;
 	/**
 	 * 建设场所(0=其他,1=居民区,2=公共机构,3=企事业单位,4=写字楼,5=工业园区,6=交通枢纽,7=大型文体设施,8=城市绿地,9=大型建筑配建停车场,10=路边停车位,11=城际高速服务区)
 	 */
 	@TableField("construction_site")
+	@ApiModelProperty(value = "建设场所(0=其他,1=居民区,2=公共机构,3=企事业单位,4=写字楼,5=工业园区,6=交通枢纽,7=大型文体设施,8=城市绿地,9=大型建筑配建停车场,10=路边停车位,11=城际高速服务区)", required = true)
 	private Integer constructionSite;
 	/**
 	 * 站点环境图
 	 */
 	@TableField("img_url")
+	@ApiModelProperty(value = "站点环境图", required = true)
 	private String imgUrl;
 	/**
 	 * 省名称
 	 */
 	@TableField("province")
+	@ApiModelProperty(value = "省名称", required = true)
 	private String province;
 	/**
 	 * 省区划代码
 	 */
 	@TableField("province_code")
+	@ApiModelProperty(value = "省区划代码", required = true)
 	private String provinceCode;
 	/**
 	 * 市名称
 	 */
 	@TableField("city")
+	@ApiModelProperty(value = "市名称", required = true)
 	private String city;
 	/**
 	 * 市区划代码
 	 */
 	@TableField("city_code")
+	@ApiModelProperty(value = "市区划代码", required = true)
 	private String cityCode;
 	/**
 	 * 区县名称
 	 */
 	@TableField("districts")
+	@ApiModelProperty(value = "区县名称", required = true)
 	private String districts;
 	/**
 	 * 区县区划代码
 	 */
 	@TableField("districts_code")
+	@ApiModelProperty(value = "区县区划代码", required = true)
 	private String districtsCode;
 	/**
 	 * 经度
 	 */
 	@TableField("lon")
+	@ApiModelProperty(value = "经度", required = true)
 	private String lon;
 	/**
 	 * 纬度
 	 */
 	@TableField("lat")
+	@ApiModelProperty(value = "纬度", required = true)
 	private String lat;
 	/**
 	 * 详细地址
 	 */
 	@TableField("address")
+	@ApiModelProperty(value = "详细地址", required = true)
 	private String address;
 	/**
 	 * 国家代码
 	 */
 	@TableField("country_code")
+	@ApiModelProperty(value = "国家代码")
 	private String countryCode;
 	/**
 	 * 站点电话
 	 */
 	@TableField("phone")
+	@ApiModelProperty(value = "站点电话", required = true)
 	private String phone;
 	/**
 	 * 服务电话
 	 */
 	@TableField("service_phone")
+	@ApiModelProperty(value = "服务电话", required = true)
 	private String servicePhone;
 	/**
 	 * 站点引导
 	 */
 	@TableField("guide")
+	@ApiModelProperty(value = "站点引导")
 	private String guide;
 	/**
 	 * 开始服务时间
 	 */
 	@TableField("start_service_time")
+	@ApiModelProperty(value = "开始服务时间")
 	private String startServiceTime;
 	/**
 	 * 结束服务时间
 	 */
 	@TableField("end_service_time")
+	@ApiModelProperty(value = "结束服务时间")
 	private String endServiceTime;
 	/**
 	 * 站内提供服务
 	 */
 	@TableField("service_description")
+	@ApiModelProperty(value = "站内提供服务")
 	private String serviceDescription;
 	/**
 	 * 车型描述
 	 */
 	@TableField("vehicle_description")
+	@ApiModelProperty(value = "车型描述")
 	private String vehicleDescription;
 	/**
 	 * 车位数
 	 */
 	@TableField("parking_space")
+	@ApiModelProperty(value = "车位数", required = true)
 	private Integer parkingSpace;
 	/**
 	 * 充电费率描述
 	 */
 	@TableField("rate_description")
+	@ApiModelProperty(value = "充电费率描述")
 	private String rateDescription;
 	/**
 	 * 超时占位费说明
 	 */
 	@TableField("space_charge_explain")
+	@ApiModelProperty(value = "超时占位费说明")
 	private String spaceChargeExplain;
 	/**
 	 * 计费策略id
 	 */
 	@TableField("accounting_strategy_id")
+	@ApiModelProperty(value = "计费策略id")
 	private Integer accountingStrategyId;
 	/**
 	 * 建站时间
 	 */
 	@TableField("establishment_time")
+	@ApiModelProperty(value = "建站时间", notes = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDate establishmentTime;
 	/**
 	 * 排序
 	 */
 	@TableField("sort")
+	@ApiModelProperty(value = "排序", required = true)
 	private Integer sort;
 	/**
 	 * 备注
 	 */
 	@TableField("remark")
+	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
 	 * 评分

--
Gitblit v1.7.1