Browse Source

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/aft.git
into test

Conflicts:
src/main/java/com/goafanti/common/mapper/DailySalesReportMapper.xml

anderx 7 years ago
parent
commit
5cdbd70434

+ 1 - 2
src/main/java/com/goafanti/common/mapper/DailySalesReportMapper.xml

@@ -427,8 +427,7 @@ from ( select
 			( select aid, count( aid ) as count1
 				from user 
 				where aid is not null and aid !=''
-				and share_type=0
-				and status != 1
+				and share_type=0 and status != 1
 				group by aid
 			) y left join admin z on
 			y.aid = z.id