conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml

@@ -15,4 +15,28 @@
        and a.award_state = #{awardState}
   </select>

   <select id="selectListByActIDAndCompanyIdAndAwardType" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignAwardSetVo">
      SELECT
         *
      FROM
         activity_sign_award_set a
      where
         a.activity_id = #{actId}
        and a.company_id = #{companyId}
        and a.award_state = #{awardState}
        and a.award_rule = #{awardRule}
   </select>

   <select id="selectActivitySignAwardSetByActIDAndCompanyIdAndAwardType" resultType="com.matrix.system.activity.entity.ActivitySignAwardSet">
      SELECT
         *
      FROM
         activity_sign_award_set a
      where
         a.activity_id = #{actId}
        and a.company_id = #{companyId}
        and a.award_state = #{awardState}
        and a.award_rule = #{awardRule}
   </select>

</mapper>