Ver código fonte

Merge branch 'test'

# Conflicts:
#	src/main/java/com/goafanti/order/service/impl/OrderStatisticsServiceImpl.java
anderx 3 anos atrás
pai
commit
4b67a6f5f6

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderStatisticsServiceImpl.java

@@ -41,7 +41,7 @@ public class OrderStatisticsServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public List<OutOrderSalesSource> orderSalesSource(InputOrderSalesSource in) {
 		if (in.getSort()==null)in.setSort(0);
-		if (in.getEndDate()!=null)in.setEndDate(in.getEndDate()+" 23:59:59");
+		if(in.getEndDate()!=null)in.setEndDate(in.getEndDate()+" 23:59:59");
 		return tOrderNewMapper.orderSalesSource(in);
 	}
 }