fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/resources/mapper/platform/PlatformFeeSettingDao.xml

@@ -20,5 +20,17 @@
    <select id="getFeeSettingByTypeAndSymbol" resultType="com.xcong.excoin.modules.platform.entity.PlatformFeeSettingEntity">

       select * from platform_fee_setting where  type = #{type} and symbol = #{symbol}

    </select>

 	
    <select id="getFeeSettingsByTypeAndSymbol" resultType="com.xcong.excoin.modules.platform.entity.PlatformFeeSettingEntity">

       select * from platform_fee_setting 
        <where>

          <if test="type != null  and  type  != ''">

              type = #{type}

          </if>

          <if test="symbol != null  and  symbol  != ''">

             and symbol = #{symbol}

          </if>

       </where>

    </select>

   

</mapper>