Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -77,7 +77,7 @@ public class DataChange {
                         return new BigDecimal(0);
                     }
                 }
-                return decimal;
+                return decimal == null ? new BigDecimal(0) : decimal;
             }
         }
         return new BigDecimal(0);