Merge branch 'dev-lzh-1009' into dev

internal/dao/bundleExtend.go

@@ -238,6 +238,9 @@ func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, to
 	if req.SubmitTimeStart != 0 {
 		session = session.Where("artist_confirmed_time >= ?", req.SubmitTimeStart/1000)
 	}
+	if req.CostType != 0 {
+		session = session.Where("cwl.cost_type = ?", req.CostType)
+	}
 	if req.User != "" {
 		if utils.IsPhoneNumber(req.User) {
 			session = session.Where("artist_phone = ?", req.User)

pb/bundle.proto

@@ -762,6 +762,7 @@ message GetUsedRecordListReq{
   int64 submitTimeEnd = 8;
   int32 page = 9;
   int32 pageSize = 10;
+  int32 costType = 11;
 }
 
 message GetUsedRecordListResp {