Merge branch 'dev-zzx' into dev-new

# Conflicts:
#	jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/ConnectorInfo.java

@@ -82,6 +82,17 @@ public class ConnectorInfo {
     @JSONField(name = "OperateStatus")
     private Integer operateStatus;
 
+    /**
+     * 运营状态
+     * 0-未知
+     * 1-建设中
+     * 5-关闭下线
+     * 6-维护中
+     * 50-正常使用
+     */
+    @JSONField(name = "OpreateStatus")
+    private Integer opreateStatus;
+
     /**
      * 国家标准
      */

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java

@@ -53,7 +53,8 @@ public class EquipmentInfo {
      * 设备生产日期  N
      * YYYY-MM-DD
      */
-    // private String ProductionDate;
+    @JSONField(name = "ProductionDate")
+     private String productionDate;
 
     /**
      * 建设时间  Y