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

src/main/java/com/caimei/modules/groupbuy/service/ProcureService.java

@@ -204,6 +204,7 @@ public class ProcureService {
                 query.addCriteria(Criteria.where("delFlag").is("1"));
             } else {
                 query.addCriteria(Criteria.where("isAchieve").is(dto.getStatus().toString()));
+                query.addCriteria(Criteria.where("delFlag").is("0"));
             }
         }
         if (StringUtils.isNotBlank(dto.getLinkMan())) {