Merge branch 'dev' into test

share-system/src/main/resources/mapper/system/SConsumerMapper.xml

@@ -127,6 +127,7 @@
         left join s_store_consumer t2 on t2.consumer_id = t1.id
         where t1.role_type = '1'
           and t2.position = '1'
+          and t2.store_id = #{storeId}
           and t1.id in (select consumer_id from s_store_consumer where store_id = #{storeId} and position = '1')
 
     </select>