商户技能查询代码调整，支持不传categoryId查询

nightFragrance-massage/src/main/java/com/ylx/collect/domain/dto/CollectSearchDTO.java

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel("收藏通用入参DTO")
+@ApiModel("我的收藏DTO")
 public class CollectSearchDTO extends Page<CollectPageVO> {
 
     @ApiModelProperty("用户id")

nightFragrance-massage/src/main/java/com/ylx/merchant/domain/dto/MerchantProjectDTO.java

@@ -18,7 +18,6 @@ public class MerchantProjectDTO extends Page<ProjectInfoVO> implements Serializa
     @ApiModelProperty("商户ID")
     private Long id;
 
-    @NotNull(message = "服务类目ID不能为空")
     @ApiModelProperty("服务类目ID")
     private Long categoryId;
 

nightFragrance-massage/src/main/resources/mapper/massage/MaTechnicianMapper.xml

@@ -638,7 +638,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getByMerchantProject" resultType="com.ylx.project.domain.bookMerchant.vo.ProjectInfoVO">
         SELECT
-            p.id AS p_id,
+            p.id AS id,
             IFNULL(mp.project_name, p.title) AS title,
             IFNULL(mp.project_duration, p.standard_duration) AS standard_duration,
             p.unit_type,
@@ -647,8 +647,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COALESCE(NULLIF(mp.project_current_price, 0), p.price) AS price
         FROM ma_project mp
         INNER JOIN project p ON mp.project_id = p.id AND p.is_delete = 0 AND p.status = 0
-        WHERE mp.merchant_id = #{dto.id}
-          AND p.category_id = #{dto.categoryId}
+        WHERE
+          mp.merchant_id = #{dto.id}
+          <if test="dto.categoryId != null">
+             AND p.category_id = #{dto.categoryId}
+          </if>
           AND mp.is_delete = 0
           AND mp.audit_status = 1
           AND mp.project_is_enable = 0