s2042968
|
1bc5ab6c4d
|
解决合并冲突
|
2024-11-21 16:49:53 +08:00 |
|
s2042968
|
4ddbc6eb34
|
查询用户分页，修改逻辑删除问题
|
2024-11-21 16:46:13 +08:00 |
 lizhanhao
|
05ff565097
|
修改删除用户功能,解决冲突
|
2024-11-21 15:38:31 +08:00 |
|
lizhanhao
|
798a15d570
|
修改删除用户功能
|
2024-11-21 15:34:15 +08:00 |
 石璞臻
|
ff453a4d52
|
修改用户发布传参模型
|
2024-11-21 15:18:08 +08:00 |
578646533@qq.com
|
66acedc8b9
|
增加导入和导出步骤
|
2024-11-21 09:31:53 +08:00 |
 sxlong
|
91e95ee10b
|
1.合并develop_comac分支代码。
|
2024-11-20 17:57:20 +08:00 |
|
sxlong
|
55ad1665b9
|
1.增加文件上传时将文件重命名并存到缓存目录再移动的逻辑；2.增加相关接口中批量上传时间和保存状态字段。
|
2024-11-20 17:40:21 +08:00 |
|
s2042968
|
00103fdff5
|
查询用户分页
|
2024-11-20 17:08:10 +08:00 |
|
s2042968
|
eea01eab93
|
Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
|
2024-11-20 11:14:28 +08:00 |
|
石璞臻
|
15733c9a6b
|
解决冲突
|
2024-11-20 10:53:59 +08:00 |
|
s2042968
|
9aece9a346
|
Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
|
2024-11-20 10:49:41 +08:00 |
|
石璞臻
|
18dab91f3b
|
Merge remote-tracking branch 'origin/develop_comac' into develop_comac
# Conflicts:
# domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java
# domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java
# infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java
# service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java
|
2024-11-20 10:49:18 +08:00 |
|
石璞臻
|
8100a55d23
|
修改用户查询字段模型，修改查询逻辑
|
2024-11-20 10:45:56 +08:00 |
|
lizhanhao
|
3bb3e4f6cc
|
提交删除用户功能
|
2024-11-20 10:41:26 +08:00 |
|
s2042968
|
ffd4f4b665
|
Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
|
2024-11-20 09:18:26 +08:00 |
|
sxlong
|
512f9724d8
|
1.增加获取子文件数量接口；2.增加文件下载接口；3.修改上传文件接口
|
2024-11-19 16:50:07 +08:00 |
|
石璞臻
|
1e2d3cdb0f
|
解决冲突bug
|
2024-11-19 13:56:31 +08:00 |
|
sxlong
|
6fa792ae48
|
1.更新创建文件夹和上传文件接口(能正常运行)。
|
2024-11-19 11:53:51 +08:00 |
|
s2042968
|
796f4a0e1a
|
Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
|
2024-11-19 09:31:27 +08:00 |
|
石璞臻
|
d0b2357390
|
查询用户返回列表
|
2024-11-19 09:23:00 +08:00 |
|
s2042968
|
239b94ec33
|
目录树查询
|
2024-11-19 09:18:16 +08:00 |
|
sxlong
|
ce18fd577e
|
1.编写上传文件接口；2.修改并添加相关接口。
|
2024-11-18 18:08:07 +08:00 |
|
sxlong
|
13ec292878
|
1.修改一些接口逻辑；2.增加上传文件数据接口。
|
2024-11-18 11:15:54 +08:00 |
|
石璞臻
|
0c6c99da04
|
解决冲突
|
2024-11-18 10:50:33 +08:00 |
|
s2042968
|
ba8280c1e0
|
解决冲突-2
|
2024-11-15 17:52:19 +08:00 |
|
s2042968
|
f89cec142c
|
解决冲突-1
|
2024-11-15 17:31:21 +08:00 |
|
s2042968
|
d2d9faedd5
|
用户登录返回result修改，拦截器实现
|
2024-11-15 17:25:24 +08:00 |
|
石璞臻
|
a96bf9630f
|
解决冲突
|
2024-11-15 17:23:57 +08:00 |
|
石璞臻
|
d52b98b459
|
解决冲突
|
2024-11-15 17:20:53 +08:00 |
|
lizhanhao
|
6816544f36
|
提交校验唯一性功能
|
2024-11-15 17:16:45 +08:00 |
|
石璞臻
|
8ce88269b8
|
获取单条用户信息
|
2024-11-15 17:12:18 +08:00 |
|
石璞臻
|
c83a56c6de
|
发布用户
|
2024-11-15 13:32:22 +08:00 |
|
lizhanhao
|
d751231aa9
|
解决合并冲突
|
2024-11-15 09:57:51 +08:00 |
|
lizhanhao
|
cf7ed38c88
|
用户编辑功能
|
2024-11-15 09:42:51 +08:00 |
|
石璞臻
|
6fda9c1b21
|
解决合并冲突
|
2024-11-15 09:36:37 +08:00 |
|
石璞臻
|
4fb0aee4f2
|
用户发布功能
|
2024-11-15 09:19:06 +08:00 |
|
s2042968
|
8a9bf52eea
|
解决冲突
|
2024-11-14 21:34:08 +08:00 |
|
s2042968
|
9a8dd4552d
|
Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
|
2024-11-14 20:16:43 +08:00 |
|
s2042968
|
006165ca80
|
用户登录功能
|
2024-11-14 19:37:15 +08:00 |
|
sxlong
|
3b027797c1
|
1.增加更新文件状态接口(不能启动);
|
2024-11-14 16:29:19 +08:00 |
|
578646533@qq.com
|
c84aea4b0f
|
bug处理
|
2024-11-13 18:00:34 +08:00 |
|
578646533@qq.com
|
2893c25caf
|
Merge branch 'develop' of https://gitee.com/shuzisaidao/electromagnetic-data into develop
|
2024-11-13 17:06:07 +08:00 |
|
578646533@qq.com
|
beb97b99a6
|
1
|
2024-11-13 17:05:59 +08:00 |
|
sxlong
|
a2e6c250b5
|
1.增加获取文件信息列表接口(能编译通过)。
|
2024-11-13 17:05:04 +08:00 |
帅帅
|
5d689f63cd
|
删除文件 service/service.iml
|
2024-11-13 08:52:29 +00:00 |
|
sxlong
|
75daf40994
|
1.增加获取文件信息列表接口(未成功运行)。
|
2024-11-13 16:46:01 +08:00 |
|
s2042968
|
3b08ca0f80
|
解决合并冲突
|
2024-11-12 17:27:15 +08:00 |
|
sxlong
|
2be0613aab
|
1.实现新建文件夹接口能写数据到数据库中。
|
2024-11-12 16:39:53 +08:00 |
|
s2042968
|
240599cf2d
|
用户模块冗余代码clean，新增用户功能
|
2024-11-12 16:14:00 +08:00 |