Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/hygf/JpStation.java

@@ -219,4 +219,13 @@ public class JpStation implements Serializable {
     private String email;	//	电子邮箱
     @TableField("rated_power")
     private Double ratedPower;	//	额定功率
+
+    /**
+     * 所属区域公司code
+     */
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java

@@ -143,5 +143,7 @@ public class JpStationDto extends BaseDto {
 
     private Double ratedPower;
 
+    private String regionalCompaniesCode;
 
+    private String amosCompanyCode;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpStation.java

@@ -206,4 +206,14 @@ public class JpStation extends BaseEntity {
 
     @TableField("rated_power")
     private Double ratedPower;
+
+
+    /**
+     * 所属区域公司code
+     */
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
 }