Merge branch 'ht-dev' of http://139.196.74.78:10010/r/drone/drone-java into...

rain

2024-07-30 d2d88ecb5fd7407b768a314fb0f88d49c40abbe8

 src/main/java/com/dji/sample/manage/model/entity/DeviceSetEntity.java

@@ -43,11 +43,10 @@
    @TableField(value = "gbServer_id")
    private String gbServerId;

    @TableField(value = "device_id")
    private String deviceId;
    @TableField(value = "device_name")
    private String deviceName;

    @TableField(value = "workspace_id")
    private String workspaceId;


}