Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/resources/mapper/settlement/SettlementBasicInfoMapper.xml

@@ -129,10 +129,11 @@
         LEFT JOIN c_supplier_info t7 ON t3.c_supplier_info_id = t7.id
         LEFT JOIN c_enterprise t8 ON t7.c_enterprise_id = t8.id
         left join trading_platform t9 on t2.trading_platform_id = t9.id
+        LEFT JOIN c_sys_user t10 ON t10.id = t7.sys_user_id
         <where>
             t1.business_type = "BillBasicInformation"
             <if test="userIds != null and userIds.size()>0">
-                AND t1.assignee_id in
+                AND t10.project_manager in
                 <foreach collection="userIds" index="index" item="item"  open="(" separator="," close=")">
                     #{item}
                 </foreach>