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

# Conflicts:
#	logs/cloud-market/error.log
#	logs/cloud-market/info.log

cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/ProductListReq.java

@@ -33,8 +33,13 @@ public class ProductListReq {
     /**
      * 产品名称
      */
-    @Schema(description = "产品名称",defaultValue = "根据身份证查询",type = "String")
+    @Schema(description = "产品名称",defaultValue = "根据产品名称查询",type = "String")
     private String productName;
+    /**
+     * 产品类型
+     */
+    @Schema(description = "产品类型",defaultValue = "金融科技",type = "String")
+    private String productType;
     /**
      * 状态
      */

cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/ProductApiServiceImpl.java

@@ -42,6 +42,8 @@ public class ProductApiServiceImpl extends ServiceImpl<ProductApiMapper, Product
                 Product::getProductName,productListReq.getProductName());
         queryWrapper.eq(StringUtils.isNotEmpty(productListReq.getProductState()),
                 Product::getProductState,productListReq.getProductState());
+        queryWrapper.eq(StringUtils.isNotEmpty(productListReq.getProductType()),
+                Product::getProductType,productListReq.getProductType());
         long count = this.count(queryWrapper);
         queryWrapper.orderByDesc(Product::getProductSales);
         queryWrapper.last("LIMIT " + ((pageNum - 1) * pageSize) + ", " + pageSize);