Commit 5310b30592972d593c6562c9ecd6d0faa2ba3ab2
Merge branch 'fixbug' into test
# Conflicts: # fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
Showing
1 changed file
with
1 additions
and
1 deletions
fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
@@ -360,7 +360,7 @@ | @@ -360,7 +360,7 @@ | ||
360 | parameterType="cn.fw.valhalla.sdk.param.CusCntReq" | 360 | parameterType="cn.fw.valhalla.sdk.param.CusCntReq" |
361 | resultType="cn.fw.valhalla.sdk.result.CusCntResult"> | 361 | resultType="cn.fw.valhalla.sdk.result.CusCntResult"> |
362 | select t1.shop_id as id,COUNT(t1.id) as cnt | 362 | select t1.shop_id as id,COUNT(t1.id) as cnt |
363 | - from customer t1 | 363 | + from customer t1 |
364 | where t1.yn = 1 | 364 | where t1.yn = 1 |
365 | <if test="req.shopIds !=null and req.shopIds.size() != 0"> | 365 | <if test="req.shopIds !=null and req.shopIds.size() != 0"> |
366 | and t1.shop_id in | 366 | and t1.shop_id in |