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

Xiajijian

2025-10-13 7df12dc3e9940768a3936b93500a9d3a2935d02b

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

 ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BindDeviceReceiver.java

@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

/**
@@ -10,13 +11,18 @@
@Data
public class BindDeviceReceiver {

    @JsonProperty("device_binding_code")
    private String deviceBindingCode;

    @JsonProperty("organization_id")
    private String organizationId;

    @JsonProperty("device_callsign")
    private String deviceCallsign;

    @JsonProperty("sn")
    private String sn;

    @JsonProperty("device_model_key")
    private String deviceModelKey;
}

 ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OrganizationGetReceiver.java

@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

/**
@@ -11,7 +12,10 @@

public class OrganizationGetReceiver {

    // 设备绑定码，必填 2025-10-11 zwy修改，使用@JsonProperty注解，使json字段名与实体类属性名对应
    @JsonProperty("device_binding_code")
    private String deviceBindingCode;

    @JsonProperty("organization_id")
    private String organizationId;
}