Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java

@@ -67,7 +67,7 @@ public class TbProductStockDetailController {
     @Log("商品报损")
     @PostMapping("frmLoss")
     @ApiOperation("商品报损")
-    public ResponseEntity<Object> frmLoss(@Validated @RequestBody TbProductFrmLossDto resources){
+    public ResponseEntity<Object> frmLoss(@RequestBody TbProductFrmLossDto resources){
         tbProductStockDetailService.frmLoss(resources);
         return new ResponseEntity<>("ok",HttpStatus.OK);
     }

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductFrmLossDto.java

@@ -1,20 +1,68 @@
 package cn.ysk.cashier.dto.product;
 
-import lombok.Data;
-import lombok.NonNull;
-
-@Data
 public class TbProductFrmLossDto {
-    @NonNull
     private String shopId;
-    @NonNull
     private String productId;
-    @NonNull
     private String coverImg;
-    @NonNull
     private Double stockNumber;
     private String remark;
     private Integer subType = -1;
     private String type = "报损";
 
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getCoverImg() {
+        return coverImg;
+    }
+
+    public void setCoverImg(String coverImg) {
+        this.coverImg = coverImg;
+    }
+
+    public Double getStockNumber() {
+        return stockNumber;
+    }
+
+    public void setStockNumber(Double stockNumber) {
+        this.stockNumber = stockNumber;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getSubType() {
+        return subType;
+    }
+
+    public void setSubType(Integer subType) {
+        this.subType = subType;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }