Merge branch 'developer' into 'master'

门店控件修复

See merge request !71

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/utils/BigDecimalJsonSeralizer.java

@@ -19,7 +19,7 @@ public class BigDecimalJsonSeralizer extends JsonSerializer<BigDecimal> {
     @Override
     public void serialize(BigDecimal value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
         if(value != null){
-            BigDecimal result = value.setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal result = value.setScale(1, BigDecimal.ROUND_HALF_UP);
             jsonGenerator.writeString(result.toString());
         }else {
             jsonGenerator.writeString("--");

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/utils/StringJsonSeralizer.java

@@ -26,7 +26,7 @@ public class StringJsonSeralizer extends JsonSerializer<String> {
         if(StringUtils.isNotBlank(value)){
             Matcher isNum = NUMBER_PATTERN.matcher(value);
             if(isNum.matches()){
-                BigDecimal decimal = new BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal decimal = new BigDecimal(value).setScale(1, BigDecimal.ROUND_HALF_UP);
                 jsonGenerator.writeString(decimal.toString());
                 return;
             }