Merge remote-tracking branch 'origin/master'

ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAgreementById" parameterType="Long" resultMap="AgreementResult">
         <include refid="selectAgreementVo"/>
-        where id = #{id}
+        where bag.id = #{id}
     </select>
     <select id="selectDistinct" resultType="com.ruoyi.bst.agreement.domain.AgreementVO">
         <include refid="selectAgreementVo"/>
@@ -237,11 +237,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="updateAgreement" parameterType="Agreement">
-        update bst_agreement
+        update bst_agreement bag
         <trim prefix="SET" suffixOverrides=",">
             <include refid="updateColumns"/>
         </trim>
-        where id = #{data.id}
+        where bag.id = #{data.id}
     </update>
 
     <sql id="updateColumns">