Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBasicInfo.java

@@ -28,6 +28,11 @@ public class PileBasicInfo extends BaseEntity {
 	@Excel(name = "桩号")
 	private String sn;
 
+	/**
+	 * 桩别名
+	 */
+	private String name;
+
 	/**
 	 * 状态（0-未知；1-在线；2-离线；3-故障）
 	 */
@@ -118,6 +123,14 @@ public class PileBasicInfo extends BaseEntity {
 		return sn;
 	}
 
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public void setBusinessType(String businessType) {
 		this.businessType = businessType;
 	}
@@ -224,6 +237,7 @@ public class PileBasicInfo extends BaseEntity {
 		return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
 				.append("id", getId())
 				.append("sn", getSn())
+				.append("name", getName())
 				.append("businessType", getBusinessType())
 				.append("secretKey", getSecretKey())
 				.append("softwareProtocol", getSoftwareProtocol())

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileDetailVO.java

@@ -23,6 +23,11 @@ public class PileDetailVO {
 	 */
 	private String pileSn;
 
+	/**
+	 * 别名
+	 */
+	private String name;
+
 	/**
 	 * 状态 0-未知；1-在线；2-离线；3-故障
 	 */