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

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -105,9 +105,9 @@
     </select>
     <select id="getByAgreementIdNew" resultType="com.ydtech.modules.protocol.entity.po.PtlAgreement">
         select
-            partner_companies_id  as  "partnercompaniesId"
+            partner_companies_id  as  "partnercompaniesId",
             association_companies_id  as  "associationCompaniesId"
-        from  ptl_agreement_dept
+        from  ptl_agreement
         <where>
             <if test="agreementId!=null  and  agreementId !=''">
                 id=#{agreementId}