Merge branch 'dev' into test

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

@@ -102,6 +102,7 @@
                  join s_consumer m on c.consumer_id = m.id
                  join s_secondary_card_conf s on c.secondary_card_conf_id = s.id
         where c.is_delete = 0
+          and c.number > 0
           and c.consumer_id = #{consumerId}
     </select>