Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev

zjj

昨天 ffbcb17a9ce705b443c3a450e3e3d56f13ee712f

 src/main/java/com/zy/asrs/entity/DeviceConfig.java

@@ -84,6 +84,9 @@
    @TableField("gateway_id")
    private Integer gatewayId;

    @TableField(exist = false)
    private Object otherData;

    public DeviceConfig() {}

    public DeviceConfig(String ip,Integer port,String threadImpl,Date createTime,String deviceType,Integer deviceNo) {