‘linchangsheng’ 7 月之前
父節點
當前提交
2c428c77fe

+ 4 - 2
src/main/java/com/zfire/mall/manager/bean/k3/KingDeeWalletVO.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.zfire.mall.manager.enums.K3CommonStatusEnum;
+import com.zfire.mall.manager.enums.K3StatusEnum;
 import com.zfire.mall.manager.plus.entity.KingDeeWallet;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,8 +25,8 @@ public class KingDeeWalletVO   {
     @ApiModelProperty(value = "钱包名称")
     private String name;
 
-    @ApiModelProperty(value = "禁用状态 A=正常 B=禁用")
-    private String forbidStatus;
+    @ApiModelProperty(value = "状态")
+    private K3CommonStatusEnum forbidStatus;
 
 
     @ApiModelProperty(value = "创建人")

+ 0 - 8
src/main/java/com/zfire/mall/manager/bean/stock/KingDeePurchaseStockOutVO.java

@@ -67,14 +67,6 @@ public class KingDeePurchaseStockOutVO   {
     private Date approveDate;
 
     @ZfireField(tbName = "kdpso")
-    @ApiModelProperty(value = "作废人")
-    private String cancellerId;
-
-    @ZfireField(tbName = "kdpso")
-    @ApiModelProperty(value = "作废日期")
-    private Date cancelDate;
-
-    @ZfireField(tbName = "kdpso")
     @ApiModelProperty(value = "备注")
     private String abcdRemarks;