增加赠品标识

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItem.java

@@ -239,6 +239,10 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @ApiModelProperty(value = "商品型号")
     private String skuModel;
 
+    @Excel(name = "赠品标识")
+    @ApiModelProperty(value = "赠品标识")
+    private Boolean flgGift;
+
 
     /**
      * 创建时间 (触发器自动处理)

src/main/java/com/dk/mdm/model/query/ivt/OutboundItemQuery.java

@@ -183,6 +183,10 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery>{
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
+    @Excel(name = "赠品标识")
+    @ApiModelProperty(value = "赠品标识")
+    private Boolean flgGift;
+
 
     /**
      * 企业ID

src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -380,6 +380,10 @@ public class OutboundItemResponse {
 
     private Boolean flgSubUnit;
 
+    @Excel(name = "赠品标识")
+    @ApiModelProperty(value = "赠品标识")
+    private Boolean flgGift;
+
     /**
      * 小数位数 ([0-6]能改大，不能改小)
      */

src/main/java/com/dk/mdm/model/vo/ivt/OutboundItemVO.java

@@ -192,6 +192,10 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
+    @Excel(name = "赠品标识")
+    @ApiModelProperty(value = "赠品标识")
+    private Boolean flgGift;
+
 
     @ApiModelProperty(value = "箱（出库中）")
     private  Integer outingBox;

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -130,14 +130,14 @@ public class StaffService extends BaseService<Staff> {
             Integer cpId = authUtils.getStaff().getCpId();
             staffQuery.setCpId(cpId);
         }
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("grade_code","STD");
-//        map.put("end_date","2099-09-01");
-//        map.put("web_max_num",1);
-//        map.put("wx_max_num",1);
-//        String s1 = JSON.toJSONString(map);
-//        // 加密
-//        String s = AESUtil.aesEncrypt(s1);
+        Map<String,Object> map = new HashMap<>();
+        map.put("grade_code","STD");
+        map.put("end_date","2024-06-06");
+        map.put("web_max_num",10);
+        map.put("wx_max_num",10);
+        String s1 = JSON.toJSONString(map);
+        // 加密
+        String s = AESUtil.aesEncrypt(s1);
 //        // 解密
 //        Map<String,Object> ss = JSON.parseObject(AESUtil.desEncrypt(s),Map.class) ;
         return super.mergeListWithCount(staffQuery, staffMapper.selectByCond(staffQuery),