Merge branch 'test' into dev

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractProductFollowUpSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class ContractProductFollowUpSelectDto extends BaseSelectDto {
 
+    /**
+     * 合同产品id
+     */
+    private Long contractProductId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductFollowUpServiceImpl.java

@@ -26,6 +26,7 @@ public class ContractProductFollowUpServiceImpl extends ServiceImpl<ContractProd
     @Override
     public List<ContractProductFollowUpVo> getList(ContractProductFollowUpSelectDto dto) {
         IWrapper<ContractProductFollowUp> wrapper = getWrapper();
+        wrapper.eq(ContractProductFollowUp::getContractProductId, dto.getContractProductId());
         wrapper.orderByDesc("cpfu", ContractProductFollowUp::getId);
         List<ContractProductFollowUpVo> list = this.baseMapper.getList(wrapper);
         return list;