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

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalVo.java

@@ -40,4 +40,9 @@ public class StockJournalVo extends StockJournal {
      */
     private String code;
 
+    /**
+     * 币种
+     */
+    private String currency;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalServiceImpl.java

@@ -141,6 +141,7 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
                 }
                 stockJournalVo.setCode(contractInfo.getCode());//单号
             }
+            stockJournalVo.setCurrency(purchase.getCurrency());//币种
             //明细数据赋值
             for (StockJournalDetailsVo stockJournalDetailsVo : stockJournalVo.getList()) {
                 stockJournalDetailsVo.setCurrency(purchase.getCurrency());//币种