Merge branch 'test' into dev

# Conflicts:
#	hx-sale/src/main/java/com/fjhx/sale/service/serviceContract/impl/ServiceContractServiceImpl.java

hx-sale/src/main/java/com/fjhx/sale/service/after/impl/AfterSalesDetailServiceImpl.java

@@ -92,7 +92,7 @@ public class AfterSalesDetailServiceImpl extends ServiceImpl<AfterSalesDetailMap
         productInfoService.attributeAssign(records, AfterSalesDetailVo::getProductId, (item, productInfo) -> {
             item.setProductCode(productInfo.getCode());
             item.setProductName(productInfo.getName());
-            item.setProductUnit(productInfo.getSpec());
+            item.setProductSpec(productInfo.getSpec());
             item.setProductUnit(productInfo.getUnit());
         });
         return page;

hx-sale/src/main/java/com/fjhx/sale/service/serviceContract/impl/ServiceContractServiceImpl.java

@@ -71,8 +71,8 @@ public class ServiceContractServiceImpl extends ServiceImpl<ServiceContractMappe
         query.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()), "sc.amount", dto.getEndAmount());
         query.le(ObjectUtil.isNotEmpty(dto.getEndAmount()), "sc.amount", dto.getEndAmount());
         //下单时间
-        query.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "sc.create_time", dto.getBeginAmount());
-
+        query.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()),"sc.create_time",dto.getBeginAmount());
+        query.ge(ObjectUtil.isNotEmpty(dto.getEndTime()),"sc.create_time",dto.getEndTime());
 
         query.groupBy("sc.id");