Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 3486499f56e487cd6df88a8fa2448ff72d72a1e0

 ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java

@@ -41,4 +41,6 @@
     * 固、枪、路、西北
     */
    private String OSD4;

    private Integer deviceBrand;
}