Merge pull request '충전내역 - 결제수단에 "제휴보상" 표시' (#58) from test into main
Reviewed-on: #58
This commit is contained in:
		| @@ -90,6 +90,7 @@ class CanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : CanQue | |||||||
|                             ) |                             ) | ||||||
|                             .or(charge.status.eq(ChargeStatus.EVENT)) |                             .or(charge.status.eq(ChargeStatus.EVENT)) | ||||||
|                             .or(charge.status.eq(ChargeStatus.ADMIN)) |                             .or(charge.status.eq(ChargeStatus.ADMIN)) | ||||||
|  |                             .or(charge.status.eq(ChargeStatus.ADS)) | ||||||
|                     ) |                     ) | ||||||
|                     .and(chargeStatusCondition) |                     .and(chargeStatusCondition) | ||||||
|             ) |             ) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user