Commit 5310b30592972d593c6562c9ecd6d0faa2ba3ab2

Authored by 夏天
2 parents 7f4fc951 f0695a76

Merge branch 'fixbug' into test

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