diff --git a/jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/service/bill/impl/BillHeadServiceImpl.java b/jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/service/bill/impl/BillHeadServiceImpl.java
index 6db498f..e36d265 100644
--- a/jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/service/bill/impl/BillHeadServiceImpl.java
+++ b/jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/service/bill/impl/BillHeadServiceImpl.java
@@ -1664,8 +1664,10 @@ public class BillHeadServiceImpl extends BaseServiceImpl<BillHeadMapper, BillHea
             item.setBillType(oldHead.getBillType());
             //检查商品属性
             this.checkItem(item);
-            if(item.getIsDelete() != null && item.getIsDelete() == 0 && item.getAllPrice() != null){
-                totalPrice = totalPrice.add(item.getAllPrice());
+            if(item.getAllPrice() != null){
+                if(item.getIsDelete() == null || item.getIsDelete() == 0){
+                    totalPrice = totalPrice.add(item.getAllPrice());
+                }
             }
             totalNum = totalNum + item.getBasicNumber();
         }
diff --git a/jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/vo/shopUser/ShopUserVo.java b/jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/vo/shopUser/ShopUserVo.java
index 1b52d6a..3fe50c4 100644
--- a/jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/vo/shopUser/ShopUserVo.java
+++ b/jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/vo/shopUser/ShopUserVo.java
@@ -31,6 +31,9 @@ public class ShopUserVo implements Serializable {
     @ApiModelProperty("是否为超级管理员0不是,1是")
     private Boolean isSuper;
 
+    @ApiModelProperty("是否为业务员0不是,1是")
+    private Integer isSales;
+
     @ApiModelProperty("创建时间")
     private Date createTime;