Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

dao/src/main/resources/mapper/CommissionDeclareMapper.xml

@@ -636,6 +636,7 @@
         commission_declare
         WHERE
         deleted = 0
+        AND business_type='COMMISSION_DECLARE_ASSET_EVALUATE'
         AND declare_user_id = #{evaluateUserId}) cd ON assets.aId = cd.xId) bus
         left join business_commission_rate bcr on bus.commission_rate_id = bcr.id
         left join dict_data dd on dd.id = bcr.business_cate_id
@@ -732,6 +733,7 @@
         commission_declare
         WHERE
         deleted = 0
+        AND business_type='COMMISSION_DECLARE_ASSET_MARKET'
         AND declare_user_id = #{marketUserId}) cd ON assets.aId = cd.xId) bus left join business_commission_rate bcr on
         bus.commission_rate_id = bcr.id
         LEFT JOIN dict_data dd ON dd.id = bcr.business_cate_id