Merge remote-tracking branch 'origin/main' into main

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java

@@ -17,9 +17,6 @@ public class ErpProductPageReqVO extends PageParam {
     @Schema(description = "产品名称", example = "李四")
     private String name;
 
-    @Schema(description = "规格型号", example = "")
-    private String deviceSpec;
-
     @Schema(description = "产品分类编号", example = "11161")
     private Long categoryId;
 

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java

@@ -36,10 +36,6 @@ public class ErpProductDO extends BaseDO {
      */
     private String name;
 
-    /**
-     * 规格型号
-     */
-    private String deviceSpec;
     /**
      * 产品条码
      */