Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -55,7 +55,7 @@
         <result column="pd_yqty" property="pd_yqty" jdbcType="DOUBLE" />
     </resultMap>
 
-    <select id="selectPurchaseListByCondition" parameterType="string" resultMap="BaseResultMap">
+    <select id="selectPurchaseListByCondition"  resultMap="BaseResultMap">
         select  *  from purchase left join purchasedetail on pu_id=pd_puid
         <where>
             <if test="con != null">
@@ -67,7 +67,7 @@
         </where>  order by pu_id,pd_detno
     </select>
 
-    <select id="selectPurchaseBycondition" parameterType="com.usoftchina.saas.purchase.dto.PurchaseReqDTO" resultMap="BaseResultMap">
+    <select id="selectPurchaseBycondition"  resultMap="BaseResultMap">
         select  *  from purchase
         <where>
             <if test="con != null">