Merge branch '2021-04-21_music_replace'

mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

@@ -264,7 +264,7 @@
         SELECT ria.*,su.phone_,o.name_ organ_name_,ri.brand_,ri.specification_,ri.param_,ri.market_price_,ri.discount_price_,ri.depreciation_price_,
         ri.sale_price_,s.name_ subject_name_,co.name_ cooperationOrganName FROM replacement_instrument_activity ria
         LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
-        LEFT JOIN subject s ON s.id_ = ri.subject_id_
+        LEFT JOIN subject s ON s.id_ = ria.subject_id_
         lEFT JOIN sys_user su ON su.id_ = ria.user_id_
         LEFT JOIN cooperation_organ co ON co.id_ = ria.cooperation_organ_id_
         LEFT JOIN organization o ON o.id_ = co.organ_id_