Merge branch 'ww' into test

src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java

@@ -196,7 +196,7 @@ public class ProductService {
         }
     }
 
-    public void updateStock(ProductStockDTO productStockDTO) {
+    public void updateStock(ProductStockDTO productStockDTO,String loginName) {
         TbProduct product = tbProductMapper.selectByShopIdAndId(productStockDTO.getProductId(), productStockDTO.getShopId());
         if (product == null) {
             throw new MsgException("商品不存在");
@@ -216,6 +216,7 @@ public class ProductService {
 //            data.put("type", "pc收银机修改库存");
             data.put("subType", product.getStockNumber() > productStockDTO.getStock() ? -1 : 1);
             data.put("number", productStockDTO.getStock() - product.getStockNumber());
+            data.put("operator", loginName);
             data.put("remark", "pc收银机修改库存");
             if (product.getStockNumber() > productStockDTO.getStock()) {
                 data.put("type", "盘点出库");