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

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java

@@ -37,7 +37,7 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
             for(RscpImageDataTotal ridt : list) {
                 RscpAreaImageTotal rait = BeanUtil.toBean(ridt, RscpAreaImageTotal.class);
                 rait.setBeginTime(ridt.getImageTakeTime());
-                rait.setImageSatelliteType(ridt.getImageSatelliteType().replace("[","{").replace("]", "}"));
+                rait.setImageResolution(rait.getImageResolution().replace("[","{").replace("]", "}"));
                 list2.add(rait);
             }
         }