Merge branch 'dev-1.1.4' into 'dev-1.1.4'

金额精度显示优化

See merge request hurugang/thmz_system!39

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpBaseMapper.java

@@ -302,7 +302,7 @@ public interface YpBaseMapper {
                     "  a.manu_code," +
                     "  a.national_code," +
                     "  b.stock_amount," +
-                    "  stock_value =isnull( b.pack_retprice,a.pack_retprice) * b.stock_amount  ," +
+                    "  stock_value =cast(isnull( b.pack_retprice,a.pack_retprice) * b.stock_amount as numeric(12, 3))  ," +
                     "  b.location," +
                     "  a.jb_flag," +
                     "  a.ym_flag" +