st000036 st000037 st000038 st000039 merge
st000055req
st000055res
st000089merge
universalRate
add unversalrate
add qenddate qstartdate
lcappant merge
st000090req
st000090res
st000096res
lccont merge
PartyRolePolicyDTO merge
payinfo merge
Merge branch 'master' of https://github.com/lovxxk/sinatay-em.git

Conflicts:
	portalModule/src/main/java/cn/com/sinosoft/portalModule/transport/sinatay/TranRequest.java