Merge branch '3.0' into 3.0-refactor

# Conflicts:
#	cost-service/src/main/java/com/blt/other/module/cost/dao/CostDao.java

cost-service/src/main/java/com/blt/other/module/cost/dao/CostDao.java

@@ -79,4 +79,6 @@ public interface CostDao extends BaseMapper<CostDomain> {
 
     //管理成本的费用单
     List<CostDomain> manageCostList(ManageCostListReq req);
+
+    List<CostDomain> manageCostList(ManageCostListReq req);
 }

cost-service/src/main/resources/mapper/Cost.xml

@@ -351,4 +351,12 @@
         where ct.is_manage_cost = 1
     </select>
 
+    <select id="manageCostList" resultType="com.blt.other.module.cost.model.CostDomain">
+        select *
+        from cost t1
+                 left join cost_type ct on t1.type_id = ct.id
+        where t1.cost_status = 4
+          and ct.is_manage_cost = 1
+    </select>
+
 </mapper>