Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_manage

Helius

2020-09-29 4181ab4d695d65d4e3a3ec953f59044aef67d809

 src/main/resources/mapper/modules/MemberMapper.xml

@@ -377,9 +377,9 @@
         )

         OR a.id = '228'

         OR a.id = '474'

         OR a.id = '644'

      )

      AND a.id != '598'

      AND a.id != '644'

   </select>

   <select id="selectTotalAmountUsdtSForBasicAllDataAlone" resultType="java.lang.String">

      SELECT