Merge branch 'master' into 'master'

优化新增药品字典

See merge request lighter/web-server!140

src/main/java/thyyxxk/webserver/service/medicine/YpDictService.java

@@ -837,6 +837,7 @@ public class YpDictService {
                 minYp.setBuyPrice(minBuyPrice.doubleValue());
                 BigDecimal minYbxjPrice = DecimalUtil.divide(ypZdDictVo.getYbxjPrice(), ypZdDictVo.getPackSize(), 3);
                 minYp.setYbxjPrice(minYbxjPrice.doubleValue());
+                minYp.setPackSize(1d);
                 int d2 = dao.insert(minYp);
             }
             YpPrintName ypPrintName = callYpPrintName(ypZdDictVo, "T");