Commits · f46ba8b41b3c8d5213a772277736cfc7e6cb0aa1 · xianyang / financial-system

13 Mar, 2023 2 commits
- 上传docker-conpose文件 · f46ba8b4
  xianyang authored Mar 13, 2023
  
  f46ba8b4
- 修改个人信息接口 · f0623f78
  xianyang authored Mar 13, 2023
  
  f0623f78
10 Mar, 2023 2 commits
- 导出包 · 700fd03a
  xianyang authored Mar 10, 2023
  
  700fd03a
- 账户列表优化，月度统计导出接口 · 7e590df3
  xianyang authored Mar 10, 2023
  
  7e590df3
08 Mar, 2023 1 commit
- 月度统计接口 · 48ad50d8
  xianyang authored Mar 08, 2023
  
  48ad50d8
07 Mar, 2023 2 commits
- Merge branch 'develop/xp' into development · f0090492
  xianyang authored Mar 07, 2023
```
# Conflicts:
#	app/api/account/schemas.py
#	app/api/margin/views.py
```
  f0090492
- 优化账户修改 · ea0276fd
  xianyang authored Mar 07, 2023
  
  ea0276fd
06 Mar, 2023 1 commit
- 代码修改 · 69fc622c
  xupeng authored Mar 06, 2023
  
  69fc622c
02 Mar, 2023 2 commits
- 新增账目类型 · 3a593bb3
  xianyang authored Mar 02, 2023
  
  3a593bb3
- 导出接口实现 · 936f3778
  xianyang authored Mar 02, 2023
  
  936f3778
01 Mar, 2023 5 commits
- 礼物类型修改接口 · 303c3f13
  xianyang authored Mar 01, 2023
  
  303c3f13
- 保证金操作接口 · 0f9d5fa7
  xianyang authored Mar 01, 2023
  
  0f9d5fa7
- 保证金接口优化优化 · f21e5452
  xianyang authored Mar 01, 2023
  
  f21e5452
- 报表-修复报表优化 · 1494f661
  xianyang authored Mar 01, 2023
  
  1494f661
- 报表-转账，财务优化 · f0925b50
  xianyang authored Mar 01, 2023
  
  f0925b50
24 Feb, 2023 8 commits
- Merge branch 'develop/xp' into development · 885f6a7f
  xianyang authored Feb 24, 2023
```
# Conflicts:
#	models/recharge.py
```
  885f6a7f
- idea · 0f04d721
  xianyang authored Feb 24, 2023
  
  0f04d721
- 财务修复列表 · 8d49f001
  xianyang authored Feb 24, 2023
  
  8d49f001
- 账户列表，导出接口 · 77b6b2ff
  xianyang authored Feb 24, 2023
  
  77b6b2ff
- 代码修改 · 101d1370
  xupeng authored Feb 24, 2023
  
  101d1370
- Merge remote-tracking branch 'origin/develop/xp' into develop/xp · b9d93b12
  xupeng authored Feb 24, 2023
```
# Conflicts:
#	app/api/statement/guild.py
#	app/api/statement/schemas.py
#	app/api/statement/views.py
```
  b9d93b12
- 打款记录和转账报表 · 48b914f9
  xupeng authored Feb 24, 2023
  
  48b914f9
- 公会保证金接口 · 4fe1640e
  xianyang authored Feb 24, 2023
  
  4fe1640e
22 Feb, 2023 1 commit
- 公会保证金接口 · 0327d8ed
  xianyang authored Feb 22, 2023
  
  0327d8ed
21 Feb, 2023 3 commits
- 优化账户模型，添加 · 10ff7a34
  xianyang authored Feb 21, 2023
  
  10ff7a34
- 优化账户列表 · 4dfe9f3b
  xianyang authored Feb 21, 2023
  
  4dfe9f3b
- 账户接口 · 9182d7c4
  xianyang authored Feb 21, 2023
  
  9182d7c4
20 Feb, 2023 1 commit
- 优化公会结算 · 6dce3032
  xianyang authored Feb 20, 2023
  
  6dce3032
17 Feb, 2023 2 commits
- 公会结算接口 · 41ca6def
  xianyang authored Feb 17, 2023
  
  41ca6def
- 用户提现，公会提现接口 · b0310bf0
  xianyang authored Feb 17, 2023
  
  b0310bf0
16 Feb, 2023 1 commit
- 角色优化，充值报表接口 · 32ab311b
  xianyang authored Feb 16, 2023
  
  32ab311b
14 Feb, 2023 1 commit
- 角色相关接口 · 52818038
  xianyang authored Feb 14, 2023
  
  52818038
13 Feb, 2023 2 commits
- 用户代码优化，用户权限接口 · d26ee1d2
  xianyang authored Feb 13, 2023
  
  d26ee1d2
- token验证、token获取用户信息————余晋熹 · b9835d72
  Administrator authored Feb 13, 2023
  
  b9835d72
10 Feb, 2023 6 commits
- 模块包配置文件————余晋熹 · 3e9d54ab
  Administrator authored Feb 10, 2023
  
  3e9d54ab
- 用户登录、验证码获取、谷歌二维码、谷歌验证(修改第三次)————余晋熹 · 856a6109
  Administrator authored Feb 10, 2023
  
  856a6109
- 查询单个用户信息 · 226350cd
  xianyang authored Feb 10, 2023
  
  226350cd
- 充值报表相关接口 · e1bc4b2a
  xianyang authored Feb 10, 2023
  
  e1bc4b2a
- Merge branch 'master' into 'development' · 0a295c32
  Administrator authored Feb 10, 2023
```
用户登录、验证码获取、谷歌二维码、谷歌验证(修改第二次)————余晋熹

See merge request xianyang/financial_system!1
```
  0a295c32
- '报表充值列表' · 6c2d6c40
  xianyang authored Feb 10, 2023
  
  6c2d6c40