chenyuan
|
96d8ffb54f
|
新增3.0同步增加用户业务
|
12 months ago |
 wanghb
|
fe704bc0e5
|
实训案例内置写死一些资料，所有学校都可见
|
1 year ago |
|
wanghb
|
d5bcd16d64
|
实训案例内置写死一些资料，所有学校都可见
|
1 year ago |
yz
|
c003d9e65b
|
新增根据studentnumber获取训练
|
1 year ago |
|
yz
|
09fb5dceb5
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java
|
1 year ago |
 chenyuan
|
5d15365fd6
|
Merge pull request '1、教师端首页报错修复' (#13) from dev-20240108 into master
Reviewed-on: #13
|
1 year ago |
|
chenyuan
|
e69f644bf5
|
Merge branch 'master' into dev-20240108
|
1 year ago |
|
陈沅
|
a38f12b112
|
1、教师端首页报错修复
|
1 year ago |
|
yz
|
73e49b0d1e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
chenyuan
|
7a69ec3ccf
|
Merge pull request '1、教师端首页报错修复' (#12) from dev-20240108 into master
Reviewed-on: #12
|
1 year ago |
|
陈沅
|
c83298356f
|
1、教师端首页报错修复
|
1 year ago |
|
yz
|
ea805e3a49
|
配置文件上传
|
1 year ago |
|
yz
|
17da9871c1
|
处理保证金为负数的情况和保证金未释放的情况
|
1 year ago |
|
yz
|
a9648ebadb
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
chenyuan
|
1680d35bd9
|
Merge pull request '1、数据获取调整' (#11) from dev-20240105 into master
Reviewed-on: #11
|
1 year ago |
|
陈沅
|
984ca14c4a
|
1、数据获取调整
|
1 year ago |
|
yz
|
1dca0585d6
|
修改了平仓后保证金未释放的问题、修改了获取实时数据报错导致盈利高的问题、优化了对冲交易的保证金计算逻辑、修改了可用资金存在却不能交易的问题
|
1 year ago |
|
chenyuan
|
937bb33720
|
Merge pull request '1、数据获取调整' (#10) from dev-20231025 into master
Reviewed-on: #10
|
1 year ago |
|
陈沅
|
1232c3441c
|
1、数据获取调整
|
1 year ago |
|
chenyuan
|
0e1c75d348
|
Merge pull request '数据获取调整' (#9) from dev-20231023 into master
Reviewed-on: #9
|
1 year ago |
|
chenyuan
|
e9d1854459
|
Merge branch 'master' into dev-20231023
|
1 year ago |
|
陈沅
|
cc186c32c7
|
数据获取调整
|
1 year ago |
|
chenyuan
|
eb424ec5e0
|
Merge pull request '1、单点登录调整' (#8) from dev-20231023 into master
Reviewed-on: #8
|
1 year ago |
|
陈沅
|
65ba988d8f
|
Merge branch 'dev-20231023'
# Conflicts:
# src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java
|
1 year ago |
|
陈沅
|
f7b901e843
|
1、单点登录调整
|
1 year ago |
|
chenyuan
|
5ab0d5dfd8
|
Merge pull request '1、单点登录调整' (#7) from dev-20231023 into master
Reviewed-on: #7
|
1 year ago |
|
陈沅
|
737813ffe7
|
1、单点登录调整
|
1 year ago |
|
chenyuan
|
e62a4d0a04
|
Merge pull request '1、单点登录调整' (#6) from dev-20231011 into master
Reviewed-on: #6
|
1 year ago |
|
陈沅
|
64f0e22b2b
|
1、单点登录调整
|
1 year ago |
|
chenyuan
|
696d4597d6
|
Merge pull request '1、单点登录调整' (#5) from dev-20231011 into master
Reviewed-on: #5
|
1 year ago |
|
陈沅
|
a5114cbfc1
|
1、单点登录调整
|
1 year ago |
|
chenyuan
|
7c459021b4
|
Merge pull request 'develop' (#4) from develop into master
Reviewed-on: #4
|
1 year ago |
|
陈沅
|
e19787069d
|
Merge branch 'master' into develop
|
1 year ago |
|
陈沅
|
bf386770e8
|
1、单点登录调整
2、系统用户操作日志修复
|
1 year ago |
|
陈沅
|
7d0cd8bd39
|
1、单点登录调整
2、系统用户操作日志修复
|
1 year ago |
|
chenyuan
|
d1b7f58b13
|
Merge pull request '1、单点登录调整' (#3) from develop into master
Reviewed-on: #3
|
1 year ago |
|
陈沅
|
2832ef4ee6
|
1、单点登录调整
2、系统用户操作日志修复
|
1 year ago |
 chuangji.xiao
|
59f07be0d3
|
Merge pull request '修改保证金预警设置不显示问题' (#2) from dev into master
Reviewed-on: #2
|
2 years ago |
xiaoCJ
|
c72cafb380
|
修改保证金预警设置不显示问题
|
2 years ago |
|
chenyuan
|
e85a286624
|
Merge pull request '主分支代码合并' (#1) from develop into master
Reviewed-on: #1
|
2 years ago |
|
陈沅
|
420ffbe89b
|
主分支代码合并
|
2 years ago |
|
xiaoCJ
|
628b1168d4
|
新增预警系统表和相关的类，任务报告提交上传，修改部分功能
|
2 years ago |
|
yz
|
2fc47bf27f
|
修改没有实训任务时，学生进入练习模式报错问题
|
2 years ago |
|
xiaoCJ
|
aa14b935bf
|
新增查看报告接口
|
2 years ago |
|
yz
|
464fc9256e
|
修改行情中心数据变化失去精度问题
|
2 years ago |
|
xiaoCJ
|
09b18be07b
|
修改保证金水平计算公式，新增侧边栏实训任务页面
|
2 years ago |
|
yz
|
2f06263dbb
|
修改行情中心刷新频率 修复练习专区持仓查询错误
|
2 years ago |
|
xiaoCJ
|
ddfe097e8b
|
新增对训练实训的预警页面操作，marginWarning表新增trainingId字段
|
2 years ago |
|
yz
|
cd52c4d6d8
|
新增根据studentnumber获取训练memberID
|
2 years ago |
|
陈沅
|
06583a0732
|
单点登录调整
|
2 years ago |