xhxu
|
a69b7b9902
|
Merge remote-tracking branch 'origin/release_toaliyun_real_202208' into release_toaliyun_real_202208
# Conflicts:
# mallinkService/src/main/java/com/iformall/mapper/WxPayAccountMapper.java
|
3 лет назад |
xhxu
|
cacf1fcbce
|
//
|
3 лет назад |
zhengfangyuan
|
de1aa63fbf
|
fix payAccount
|
3 лет назад |
zhengfangyuan
|
f57a59c0ef
|
fix payAccount
|
3 лет назад |
zhengfangyuan
|
ba87224ffb
|
fix pay v3
|
3 лет назад |
zhengfangyuan
|
e7eeac2c0e
|
fix pay v3
|
3 лет назад |
zhengfangyuan
|
22ebf43e44
|
fix pay v3
|
3 лет назад |
zhengfangyuan
|
ffa23d0ab6
|
Merge branch 'release_toaliyun_real_202208' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202208
|
3 лет назад |
zhengfangyuan
|
24f076497f
|
fix pay v3
|
3 лет назад |
xhxu
|
9bf612840a
|
// onlin
|
3 лет назад |
xhxu
|
c2643d1bc1
|
Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202208
Conflicts:
mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
|
3 лет назад |
zhengfangyuan
|
36b14919f2
|
fix pay v3
|
3 лет назад |
xhxu
|
2c7574871e
|
// merchantReciver
|
3 лет назад |
xhxu
|
cde884e588
|
// verify
|
3 лет назад |
xhxu
|
55499d8375
|
// pay order
|
3 лет назад |
xhxu
|
358aa4da94
|
// verify
|
3 лет назад |
zhengfangyuan
|
20033f9e03
|
add pay v3
|
3 лет назад |
xhxu
|
dae36625a8
|
// verify
|
3 лет назад |
xhxu
|
9e576f3a84
|
// merchant_type
|
3 лет назад |
xhxu
|
df8ce4da7e
|
Merge remote-tracking branch 'origin/release_toaliyun_real' into release_toaliyun_real
|
3 лет назад |
xhxu
|
d858a94d71
|
// plan
|
3 лет назад |
zhengfangyuan
|
72d345e112
|
Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real
|
3 лет назад |
xhxu
|
5cfca00755
|
// plan
|
3 лет назад |
zhengfangyuan
|
1632131462
|
Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207
|
3 лет назад |
zhengfangyuan
|
6fb03ec5d9
|
fix bill bug
|
3 лет назад |
xhxu
|
da9da4b950
|
// merchant
|
3 лет назад |
zhengfangyuan
|
e812c65e1a
|
fix bill bug
|
3 лет назад |
zhengfangyuan
|
14fb346b7d
|
Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207
|
3 лет назад |
zhengfangyuan
|
f006927ab3
|
fix bill
|
3 лет назад |
xhxu
|
7fda411900
|
// PLAN
|
3 лет назад |
zhengfangyuan
|
a87c0570c6
|
fix bill
|
3 лет назад |
zhengfangyuan
|
d208740f89
|
fix bill
|
3 лет назад |
zhengfangyuan
|
88926e22ca
|
Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207
|
3 лет назад |
zhengfangyuan
|
8fb39b8f98
|
fix bill
|
3 лет назад |
xhxu
|
d9b78f6e59
|
Merge remote-tracking branch 'origin/release_toaliyun_real_202207' into release_toaliyun_real_202207
|
3 лет назад |
xhxu
|
f87fce1298
|
// test
|
3 лет назад |
zhengfangyuan
|
e92fbfaecc
|
Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207
|
3 лет назад |
zhengfangyuan
|
c6e5135632
|
fix bill
|
3 лет назад |
xhxu
|
1f9645bbb3
|
// test
|
3 лет назад |
xhxu
|
bf29af1511
|
// merchant
|
3 лет назад |
xhxu
|
235fe7dddc
|
// merchant
|
3 лет назад |
xhxu
|
fe9e8e4ad4
|
Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207
|
3 лет назад |
xhxu
|
a689819131
|
// merchant
|
3 лет назад |
zhengfangyuan
|
8f617d399c
|
fix bug
|
3 лет назад |
zhengfangyuan
|
cf4866a348
|
fix
|
3 лет назад |
zhengfangyuan
|
baa62d3784
|
fix bill
|
3 лет назад |
zhengfangyuan
|
786e51650c
|
Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207
|
3 лет назад |
zhengfangyuan
|
2e44853aed
|
fix rent bill
|
3 лет назад |
xhxu
|
529788397e
|
// shar
|
3 лет назад |
zhengfangyuan
|
5a34974950
|
Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207
|
3 лет назад |