Merge branch 'master' into 3.0

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

@@ -149,6 +149,7 @@
         from cost t1
         left join cost_current_reviewer tt on t1.cost_no = tt.cost_no
         where tt.oa_user_id =#{req.oaUserId}
+        and t1.cost_status != 5
         <if test=" req.startTime!=null">
             and t1.create_time &gt;=#{req.startTime}
         </if>
@@ -169,7 +170,7 @@
         select *
         from cost
         where create_userid = #{req.oaUserId}
-        and cost_status in (6,7,8,9)
+        and cost_status in (4,6,7,8,9)
         <if test=" req.startTime!=null">
             and create_time &gt;=#{req.startTime}
         </if>