 chenxudong
|
bb6058be9c
|
Merge branch 'test' into develop
# Conflicts:
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
# electrmangnetic/src/main/resources/application.properties
解决部分冲突。
|
2025-02-24 17:07:32 +08:00 |
|
chenxudong
|
ac415f13b4
|
增加自定义层级相关功能
|
2025-02-20 15:13:22 +08:00 |
|
chenxudong
|
634dd42778
|
解决层级沿用的bug
|
2025-02-19 16:20:08 +08:00 |
s2042968
|
c014db1dcf
|
增加复制/移动时，对于目标文件夹的权限校验
|
2025-02-19 10:52:36 +08:00 |
|
s2042968
|
4faab3d89b
|
逻辑删除文件时，同时删除文件关系
|
2025-02-14 09:40:35 +08:00 |
|
chenxudong
|
40ce933356
|
配置文件更新
|
2025-02-13 09:35:34 +08:00 |
|
chenxudong
|
bac3da7d8f
|
优化配置文件
|
2025-02-11 15:32:55 +08:00 |
|
chenxudong
|
12a4d198a6
|
实现了部分接口，提交备份。
|
2024-12-20 14:15:07 +08:00 |
|
chenxudong
|
1f5a7620ad
|
clean properties
|
2024-12-18 17:41:31 +08:00 |
|
chenxudong
|
8cb8c4c834
|
重新整理日志相关依赖。
|
2024-12-18 09:36:05 +08:00 |
|
chenxudong
|
25ee4a5fa2
|
实现部分功能
|
2024-12-18 08:55:48 +08:00 |
|
chenxudong
|
4ad81053fb
|
reformat code
|
2024-12-13 16:12:27 +08:00 |
|
chenxudong
|
7360a4d1fa
|
修改启动端口
|
2024-12-13 15:31:02 +08:00 |
|
chenxudong
|
3294cc04bb
|
第一次提交。
|
2024-12-13 15:27:59 +08:00 |