Commits · 548ab837afd647d9f9563a5a1b9e8e8cac231230 · fitness-server / fit-finance · GitLab

14 Aug, 2024 12 commits
- Merge branch 'feature/mini-pay' into release/rc · 548ab837
  程裕兵 committed Aug 14, 2024
  
  548ab837 Browse Files
- feat:添加半屏小程序 · c608fbd2
  程裕兵 committed Aug 14, 2024
  
  c608fbd2 Browse Files
- Merge branch 'feature/mini-pay' into release/rc · 131204ec
  程裕兵 committed Aug 14, 2024
  
  131204ec Browse Files
- feat:添加半屏小程序 · 3db0a744
  程裕兵 committed Aug 14, 2024
  
  3db0a744 Browse Files
- feat:添加半屏小程序 · 81347470
  程裕兵 committed Aug 14, 2024
  
  81347470 Browse Files
- feat:添加半屏小程序 · 4136ba07
  程裕兵 committed Aug 14, 2024
  
  4136ba07 Browse Files
- feat:添加半屏小程序 · 6be0e033
  程裕兵 committed Aug 14, 2024
  
  6be0e033 Browse Files
- feat:添加半屏小程序 · 222c702d
  程裕兵 committed Aug 14, 2024
  
  222c702d Browse Files
- feat:添加半屏小程序 · 84970b15
  程裕兵 committed Aug 14, 2024
  
  84970b15 Browse Files
- feat:添加半屏小程序 · 15762201
  程裕兵 committed Aug 14, 2024
  
  15762201 Browse Files
- feat:添加半屏小程序 · 9ec89f85
  程裕兵 committed Aug 14, 2024
  
  9ec89f85 Browse Files
- feat:添加半屏小程序 · 600c723c
  程裕兵 committed Aug 14, 2024
  
  600c723c Browse Files
13 Aug, 2024 6 commits
- feat:添加半屏小程序 · 41fe69ff
  程裕兵 committed Aug 13, 2024
  
  41fe69ff Browse Files
- feat:添加半屏小程序 · 15ec7023
  程裕兵 committed Aug 13, 2024
  
  15ec7023 Browse Files
- feat:添加半屏小程序 · fab00c3f
  程裕兵 committed Aug 13, 2024
  
  fab00c3f Browse Files
- feat:添加半屏小程序 · 48f3a19a
  程裕兵 committed Aug 13, 2024
  
  48f3a19a Browse Files
- feat:添加半屏小程序 · 2f69d54c
  程裕兵 committed Aug 13, 2024
  
  2f69d54c Browse Files
- feat:添加半屏小程序 · 5cf40f4a
  程裕兵 committed Aug 13, 2024
  
  5cf40f4a Browse Files
24 Jul, 2024 3 commits
- feat:check sms code · 95e75898
  程裕兵 committed Jul 24, 2024
  
  95e75898 Browse Files
- feat:东莞市&中山市 · 8e2bfce7
  程裕兵 committed Jul 24, 2024
  
  8e2bfce7 Browse Files
- feat:reset address · 7c858ea1
  程裕兵 committed Jul 24, 2024
  
  7c858ea1 Browse Files
22 Jul, 2024 1 commit
- Merge branch 'feature/yangpeifeng' into 'master' · fef7bddf
```
<新功能> 乐动电子化合同

See merge request !1
```
  杨培锋 committed Jul 22, 2024
  fef7bddf Browse Files
25 Jun, 2024 2 commits
- Merge branch 'master' into release/rc · ac44ca4c
  程裕兵 committed Jun 25, 2024
  
  ac44ca4c Browse Files
- feat:refund statistic · 072d62ef
  程裕兵 committed Jun 25, 2024
  
  072d62ef Browse Files
24 Jun, 2024 5 commits
- Merge branch 'master' into release/rc · 23e545c9
  程裕兵 committed Jun 24, 2024
  
  23e545c9 Browse Files
- feat:refund message format · 75d37e07
  程裕兵 committed Jun 24, 2024
  
  75d37e07 Browse Files
- Merge branch 'feature/yangpeifeng' into release/rc · cbfe2d16
  程裕兵 committed Jun 24, 2024
  
  cbfe2d16 Browse Files
- feat:upgrade api maven version 0.0.1 -> 0.0.2 · 4be40f50
  程裕兵 committed Jun 24, 2024
  
  4be40f50 Browse Files
- feat:app pay and native pay · e304fefc
  程裕兵 committed Jun 24, 2024
  
  e304fefc Browse Files
20 Jun, 2024 5 commits
- Merge branch 'master' into release/rc · 667a4aa8
  程裕兵 committed Jun 20, 2024
  
  667a4aa8 Browse Files
- feat:refund message · 65a27cdb
  程裕兵 committed Jun 20, 2024
  
  65a27cdb Browse Files
- log · 8aa07bdf
  程裕兵 committed Jun 20, 2024
  
  8aa07bdf Browse Files
- Merge branch 'master' into release/rc · 6344e798
  程裕兵 committed Jun 20, 2024
  
  6344e798 Browse Files
- feat:refund check fail message · 88e7a9a5
  程裕兵 committed Jun 20, 2024
  
  88e7a9a5 Browse Files
18 Jun, 2024 3 commits
- Merge branch 'master' into release/rc · d245929f
```
# Conflicts:
#	service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java
```
  程裕兵 committed Jun 18, 2024
  d245929f Browse Files
- feat:fix repeat process pay callback and trigger cashier event · f9254b34
  程裕兵 committed Jun 18, 2024
  
  f9254b34 Browse Files
- feat:fix repeat process refund callback and trigger cashier event · 6a7ec088
  程裕兵 committed Jun 18, 2024
  
  6a7ec088 Browse Files
17 Jun, 2024 3 commits
- feat:send wx · fd76e201
  程裕兵 committed Jun 17, 2024
  
  fd76e201 Browse Files
- feat:log · 15aa665a
  程裕兵 committed Jun 17, 2024
  
  15aa665a Browse Files
- Merge branch 'master' into release/rc · b142fab9
```
# Conflicts:
#	service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java
```
  程裕兵 committed Jun 17, 2024
  b142fab9 Browse Files