zhujunjieit
|
24c324ea36
|
Merge remote-tracking branch 'origin/master'
|
2019-01-29 00:09:34 +08:00 |
|
zhujunjieit
|
3eee859042
|
收藏考试优化
|
2019-01-29 00:09:25 +08:00 |
flower
|
08e7299310
|
session中加入user
|
2019-01-29 00:02:00 +08:00 |
|
flower
|
105478f0a6
|
试题查询模糊匹配
|
2019-01-28 23:33:54 +08:00 |
|
flower
|
1e350c0060
|
Merge remote-tracking branch 'origin/master'
|
2019-01-28 23:16:28 +08:00 |
|
flower
|
cd5c601a36
|
优化收藏
|
2019-01-28 23:16:21 +08:00 |
|
zhujunjieit
|
8d64b3852a
|
优化小程序登陆
|
2019-01-28 23:09:21 +08:00 |
|
flower
|
89479763d5
|
Merge remote-tracking branch 'origin/master'
|
2019-01-28 23:04:56 +08:00 |
|
flower
|
8c607337a9
|
考试bug修改
|
2019-01-28 23:04:39 +08:00 |
zhujj
|
884a16ac04
|
批量删除成员改为post方法
|
2019-01-28 17:32:39 +08:00 |
|
zhujj
|
d486b5db20
|
返回文字提示
|
2019-01-28 15:15:07 +08:00 |
|
zhujj
|
7b4ffe1c3a
|
有可能是这个return "error"的影响会报错
|
2019-01-28 13:30:14 +08:00 |
|
flower
|
815ffbf39a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
|
2019-01-28 03:21:28 +08:00 |
|
flower
|
9687b69835
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
|
2019-01-28 03:17:44 +08:00 |
|
zhujunjieit
|
043a4a80fd
|
用户信息修改，头像上传，密码修改
|
2019-01-28 03:17:29 +08:00 |
|
flower
|
a26c226748
|
用户注册密码长度修改
|
2019-01-28 03:14:28 +08:00 |
|
zhujunjieit
|
1527c4c0a0
|
用户信息修改，头像上传，密码修改
|
2019-01-28 03:14:17 +08:00 |
|
zhujunjieit
|
f278d03caa
|
Revert "用户注册"
This reverts commit 304f94a340.
|
2019-01-28 03:07:44 +08:00 |
|
zhujunjieit
|
c34d44dfdb
|
用户信息修改，头像上传，密码修改
|
2019-01-28 03:00:32 +08:00 |
|
zhujunjieit
|
15413b401b
|
Merge remote-tracking branch 'origin/master'
|
2019-01-28 02:59:19 +08:00 |
|
flower
|
304f94a340
|
用户注册
|
2019-01-28 02:21:38 +08:00 |
|
zhujunjieit
|
809056b560
|
Merge remote-tracking branch 'origin/master'
|
2019-01-28 00:33:35 +08:00 |
zhujunjieit
|
e51cf575ff
|
删除文件ruoyi-cms/ruoyi-cms.iml
|
2019-01-28 00:33:19 +08:00 |
|
zhujunjieit
|
238a3b78cf
|
Revert "订单列表"
This reverts commit 2da0a0b
|
2019-01-28 00:20:54 +08:00 |
|
zhujunjieit
|
a7a3ed5b0e
|
Revert "订单列表"
This reverts commit 2da0a0b
|
2019-01-28 00:20:24 +08:00 |
|
zhujunjieit
|
da2057e162
|
Revert "Revert "订单列表""
This reverts commit 17db5a8
|
2019-01-28 00:19:31 +08:00 |
|
zhujunjieit
|
17db5a8fba
|
Revert "订单列表"
This reverts commit 2da0a0b01d.
# Conflicts:
# ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
# ruoyi-cms/src/main/resources/templates/web/user/set.html
|
2019-01-28 00:15:23 +08:00 |
|
zhujunjieit
|
f92c7842e1
|
我的订单接口
|
2019-01-28 00:09:40 +08:00 |
|
flower
|
2da0a0b01d
|
订单列表
|
2019-01-27 23:27:05 +08:00 |
|
flower
|
a9f8ee4104
|
完善考试记录,考试交卷
|
2019-01-27 23:21:11 +08:00 |
|
flower
|
1eac91410a
|
Merge remote-tracking branch 'origin/master'
|
2019-01-27 22:45:35 +08:00 |
|
flower
|
05b007dc6a
|
完善考试记录,考试交卷
|
2019-01-27 22:45:23 +08:00 |
|
zhujunjieit
|
1ec7896b38
|
优化配置，防止重复报错
|
2019-01-27 22:39:12 +08:00 |
|
zhujunjieit
|
68f9ae93ac
|
ui完善
|
2019-01-27 21:41:45 +08:00 |
|
flower
|
3bc8c3518c
|
考试次数字段
|
2019-01-27 16:50:28 +08:00 |
|
zhujunjieit
|
f43ef6519f
|
订单完善
|
2019-01-26 13:51:36 +08:00 |
|
flower
|
a47d5ae284
|
报名功能完善
|
2019-01-26 11:38:53 +08:00 |
|
zhujunjieit
|
ba156e72ff
|
整数金额优化
|
2019-01-26 01:29:09 +08:00 |
|
flower
|
1a53f0a436
|
Merge remote-tracking branch 'origin/master'
|
2019-01-26 01:04:46 +08:00 |
|
flower
|
8a0736d8fe
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
# ruoyi-cms/src/main/resources/templates/web/index.html
|
2019-01-26 01:00:20 +08:00 |
|
zhujunjieit
|
50ef9a21f6
|
微信小程序课程支付调用
|
2019-01-26 01:00:07 +08:00 |
|
flower
|
b92279a498
|
优化错题,收藏,增加删除,增加报名列表
|
2019-01-26 00:55:09 +08:00 |
|
zhujunjieit
|
eea3be39c6
|
课程支付
|
2019-01-25 21:13:59 +08:00 |
|
zhujj
|
87f76ce893
|
课程购买逻辑判断
|
2019-01-25 18:10:09 +08:00 |
|
zhujj
|
a0183414a9
|
基础insert和update自动填充用户信息时增加判断
|
2019-01-25 17:51:56 +08:00 |
|
zhujj
|
b6a3a5df35
|
基础insert和update自动填充用户信息时增加判断
|
2019-01-25 15:43:56 +08:00 |
|
zhujj
|
86b0893d8b
|
微信支付回调优化
|
2019-01-25 15:28:26 +08:00 |
|
zhujj
|
fd71a1ac61
|
微信支付回调
|
2019-01-25 15:03:57 +08:00 |
|
zhujj
|
bc6328c38e
|
微信支付回调
|
2019-01-25 14:16:55 +08:00 |
|
zhujj
|
2318190e42
|
微信支付回调
|
2019-01-25 14:14:31 +08:00 |