Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-12 785994b056124cea63120ba6b592a0d277f70075

 zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml

@@ -113,8 +113,8 @@
         <if test="type != null and type !='' ">
            type = #{type},
         </if>
         <if test="taotal != null and taotal !='' ">
            taotal = #{taotal},
         <if test="total != null and total !='' ">
            total = #{total},
         </if>
         <if test="times != null and times !='' ">
            times = #{times},