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

kaiyu

2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c

 screen-common/src/main/java/com/moral/constant/Constants.java

@@ -218,5 +218,6 @@
     * 字典表无人机设备类型
     * */
    public static final String SPECIAL_DEVICE_UAV = "1";

    
}