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

src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml

@@ -109,7 +109,7 @@
         and tbs_activity_center_goods.del_flag = 0
         and tbs_cost_apply.del_flag = 0
         and tbs_cost_apply.cancel_flag = 0
-        and tbs_cost_apply.charge_state in (2,3)
+        and tbs_cost_apply.charge_state in (1,2,3,4)
           and (
             bir_activity_center_goods.activity_id is null
             or bir_activity_center_goods.activity_total_amount != tbs_activity.total_amount
@@ -179,7 +179,7 @@
     <select id="selectErrorBir" resultType="com.qs.serve.modules.bir.entity.BirActivityCenterGoods">
         select bir_activity_center_goods.* from bir_activity_center_goods left join tbs_cost_apply
             on tbs_cost_apply.id = bir_activity_center_goods.cost_apply_id
-        where charge_state not in (2,3)
+        where charge_state not in (1,2,3,4)
     </select>
 </mapper>