Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/domain/AirData.java

@@ -143,7 +143,7 @@ public class AirData extends BaseEntity {
      * PM1.0(单位ug/m3)
      */
     @TableField(value = "pm_1_0")
-    private String pm_1_0;
+    private String pm1;
 
     /**
      *PM10(单位ug/m3)

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/syncdata/SyncAirDataService.java

@@ -97,7 +97,7 @@ public class SyncAirDataService {
         airData.setNh3(nh3);
         airData.setOx(ox);
         airData.setPh3(ph3);
-        airData.setPm_1_0(pm_1_0);
+        airData.setPm1(pm_1_0);
         airData.setPm10(pm_10);
         airData.setPm25(pm_2_5);
         airData.setSo2(so2);