Commit 77dbc4d0 by zhoujunpeng

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

# Conflicts:
#	isc-common-core/src/main/resources/mapper/fxdmapper.xml
parents 9e973b3c 76f905e1
......@@ -379,9 +379,6 @@
from fxd
where ownref = #{ownref}
</select>
<select id="queryFxdInfo" resultType="com.brilliance.isc.vo.funds.FxdWithPtsCbbResponseVo">
</select>
</mapper>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment