Commit Graph

37 Commits

Author SHA1 Message Date
lizhanhao 798a15d570 修改删除用户功能 2024-11-21 15:34:15 +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
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
石璞臻 1e2d3cdb0f 解决冲突bug 2024-11-19 13:56:31 +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
s2042968 f89cec142c 解决冲突-1 2024-11-15 17:31:21 +08:00
s2042968 d2d9faedd5 用户登录返回result修改,拦截器实现 2024-11-15 17:25:24 +08:00
石璞臻 d52b98b459 解决冲突 2024-11-15 17:20:53 +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 44d54c632a bug处理 2024-11-14 21:20:22 +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 ec74835a08 1.增加更新文件状态接口(能正常运行); 2024-11-14 16:45:03 +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 beb97b99a6 1 2024-11-13 17:05:59 +08:00
帅帅 4a26d05c8e
删除文件 infrastructure/common/common.iml 2024-11-13 08:53:34 +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
sxlong 42d1949371 1.添加User接口能通过版。 2024-10-31 16:27:27 +08:00
sxlong 78e7f6eb48 1.添加User接口代码。 2024-10-29 10:50:16 +08:00
sxlong d593488a21 1.框架代码初始化提交。 2024-10-29 10:46:45 +08:00