玖兮冉
|
7d00dae5ef
|
Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
# Conflicts:
# src/main/java/com/ybw/mathapp/Main.java
|
4 months ago |
杨博文
|
bc34de13ce
|
v1.6 题目生成逻辑修改完毕
|
4 months ago |
|
玖兮冉
|
4b62d84eca
|
v2.2 添加了用户名功能，并测试基本功能
|
4 months ago |
|
玖兮冉
|
7b4118d63e
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
|
杨博文
|
417928c39a
|
Merge remote-tracking branch 'origin/ybw_branch'
|
4 months ago |
|
杨博文
|
3457e64dcc
|
v1.6 小学题目排除除零问题
|
4 months ago |
|
玖兮冉
|
a8bc234395
|
Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
# Conflicts:
# users.txt
|
4 months ago |
|
玖兮冉
|
8a477d5d69
|
v2.1 添加了用户名功能，并测试基本功能
|
4 months ago |
|
杨博文
|
2f85a10320
|
v1.5 完成
|
4 months ago |
|
玖兮冉
|
ab5345e732
|
v2.0 添加了用户名功能，并测试基本功能
|
4 months ago |
|
玖兮冉
|
1aef7d378b
|
Merge branch 'wsf_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
# Conflicts:
# src/main/java/com/wsf/mathapp/view/RegisterView.java
# src/main/java/com/ybw/mathapp/LoginAndRegister.java
# src/main/java/com/ybw/mathapp/service/StartController.java
|
4 months ago |
|
玖兮冉
|
f77a0f8cc9
|
v2.0 添加了用户名功能，并测试基本功能
|
4 months ago |
|
玖兮冉
|
b85959fdfe
|
Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
|
4 months ago |
|
杨博文
|
cf59537031
|
v1.5 完成
|
4 months ago |
|
玖兮冉
|
2e85231da8
|
Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
# Conflicts:
# src/main/java/com/ybw/mathapp/entity/User.java
# src/main/java/com/ybw/mathapp/system/LogSystem.java
|
4 months ago |
|
杨博文
|
6ecc72533a
|
v1.4 基本完成
|
4 months ago |
|
玖兮冉
|
5c0611eac5
|
v1.5 重复登录功能有bug，已修复
|
4 months ago |
|
玖兮冉
|
58a80873a0
|
v1.4 基本功能已经实现，修改密码功能暂未实现
|
4 months ago |
|
玖兮冉
|
297c3a9146
|
Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
# Conflicts:
# src/main/java/com/ybw/mathapp/service/Calculate.java
# src/main/java/com/ybw/mathapp/service/ChoiceGenerator.java
# src/main/java/com/ybw/mathapp/service/FileHandler.java
# src/main/java/com/ybw/mathapp/service/PrimarySchoolGenerator.java
# src/main/java/com/ybw/mathapp/service/QuestionDeduplicator.java
# src/main/java/com/ybw/mathapp/service/SeniorHighGenerator.java
# src/main/java/com/ybw/mathapp/service/StartController.java
|
4 months ago |
|
玖兮冉
|
8d02f5a3f4
|
v1.3
|
4 months ago |
|
杨博文
|
1ec2d114e3
|
v1.3 题目生成逻辑实现
|
4 months ago |
|
杨博文
|
379a619104
|
v1.3 题目生成逻辑实现
|
4 months ago |
|
玖兮冉
|
1c618fd01a
|
v1.3
|
4 months ago |
|
玖兮冉
|
e48fe3fbb3
|
Merge branch 'wsf_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
# Conflicts:
# src/main/java/com/wsf/mathapp/view/RegisterView.java
# src/main/java/com/ybw/mathapp/LoginAndRegister.java
# src/main/java/com/ybw/mathapp/service/StartController.java
|
4 months ago |
|
玖兮冉
|
368c357ce4
|
Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
# Conflicts:
# src/main/java/com/ybw/mathapp/service/StartController.java
|
4 months ago |
|
玖兮冉
|
5558669058
|
v1.2
|
4 months ago |
|
杨博文
|
deb026c631
|
v1.2 登录、注册接口书写完成
|
4 months ago |
|
杨博文
|
42d1b8716a
|
v1.1 登录、注册接口书写完成
|
4 months ago |
|
玖兮冉
|
f063724d4b
|
v1.1 大概的框架已经写好，与后端能都对接，但功能未完善
|
4 months ago |
|
玖兮冉
|
c7763f9ce9
|
v1.1 大概的框架已经写好，与后端能都对接，但功能未完善
|
4 months ago |
|
玖兮冉
|
e2e0d99656
|
v1.0 大概的框架已经写好，未与后端对接
|
4 months ago |
|
玖兮冉
|
997acd73ec
|
Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
# Conflicts:
# src/main/java/module-info.java
|
4 months ago |
|
玖兮冉
|
0774642a33
|
Merge branch 'master' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
|
4 months ago |
 ppy4sjqvf
|
08f3d8ff8f
|
v0.0
|
4 months ago |
|
杨博文
|
62c59450f5
|
v1.0 题目处理逻辑还没弄好，未与前端对接
|
4 months ago |
|
ppy4sjqvf
|
5a4a9efede
|
Merge pull request 'v0.0' (#1) from ybw_branch into develop
|
4 months ago |
|
杨博文
|
5a4ec41169
|
Merge branch 'ybw_branch' of https://bdgit.educoder.net/ppy4sjqvf/pairedProject
|
4 months ago |
|
杨博文
|
a58fa544a3
|
v0.0
|
4 months ago |
|
ppy4sjqvf
|
ba3444f890
|
Initial commit
|
4 months ago |
