s2042968
|
520d1885f7
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data into develop
|
2024-12-02 14:42:16 +08:00 |
|
s2042968
|
d52acbc776
|
管理员账号限制删除
|
2024-12-02 14:41:44 +08:00 |
 sxlong
|
8eae6e860b
|
1.修改类的接口增加用户信息的获取。
|
2024-11-29 17:19:16 +08:00 |
|
s2042968
|
e34973d774
|
Merge branch 'test' into develop_comac
|
2024-11-29 16:11:00 +08:00 |
|
s2042968
|
0a1616fd53
|
创建本地线程存储用户信息，修改token加密方式
|
2024-11-29 16:08:19 +08:00 |
578646533@qq.com
|
464f46cbf7
|
Merge branch 'develop' into test
# Conflicts:
# bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java
# domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
# service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
|
2024-11-27 11:23:15 +08:00 |
|
sxlong
|
286f23ad21
|
1.增加导出数据接口。
|
2024-11-26 09:31:30 +08:00 |
|
sxlong
|
4bc0c04706
|
1.增加数据导出接口。
|
2024-11-25 11:09:55 +08:00 |
|
578646533@qq.com
|
dc26b61e18
|
去除无效的引用
|
2024-11-22 10:10:44 +08:00 |
|
s2042968
|
ba8280c1e0
|
解决冲突-2
|
2024-11-15 17:52:19 +08:00 |
|
s2042968
|
d2d9faedd5
|
用户登录返回result修改，拦截器实现
|
2024-11-15 17:25:24 +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 |
|
578646533@qq.com
|
c84aea4b0f
|
bug处理
|
2024-11-13 18:00:34 +08:00 |
帅帅
|
0d9e44e1f6
|
删除文件 electromagnetic-framework/electromagnetic-framework.iml
|
2024-11-13 08:52:14 +00:00 |
|
帅帅
|
3fb84c0c12
|
删除文件 electromagnetic-framework/framework.iml
|
2024-11-13 08:50:07 +00:00 |
|
s2042968
|
240599cf2d
|
用户模块冗余代码clean，新增用户功能
|
2024-11-12 16:14:00 +08:00 |
|
s2042968
|
8e5358e285
|
Remove .idea directory
|
2024-11-12 15:24:36 +08:00 |
|
578646533@qq.com
|
ce12ce3b63
|
删除无效信息
|
2024-11-07 13:49:17 +08:00 |
|
sxlong
|
d593488a21
|
1.框架代码初始化提交。
|
2024-10-29 10:46:45 +08:00 |