gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java
pull/57/head
shao1121353141 2023-09-25 19:31:29 +08:00
parent 76905710ed 9a5c6d68d6
commit fd43715e76
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java
View File

@ -58,7 +58,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized {
* 获取我的应用列表
*
* @param userId {@link Long}
* @param query {@link GetAppListQuery}
* @param query {@link query}
* @param pageable {@link String}
* @return {@link List}
*/

2
eiam-console/src/main/console-fe/package.json
View File

@ -47,7 +47,7 @@
"@ant-design/charts": "^1.4.2",
"@ant-design/icons": "^5.2.6",
"@ant-design/maps": "^1.0.7",
"@ant-design/pro-components": "^2.6.23",
"@ant-design/pro-components": "^2.6.24",
"ahooks": "^3.7.8",
"antd": "^5.9.2",
"antd-img-crop": "^4.13.0",

2
eiam-portal/src/main/portal-fe/package.json
View File

@ -48,7 +48,7 @@
"@ant-design/charts": "^1.4.2",
"@ant-design/icons": "^5.2.6",
"@ant-design/maps": "^1.0.7",
"@ant-design/pro-components": "^2.6.23",
"@ant-design/pro-components": "^2.6.24",
"ahooks": "^3.7.8",
"antd": "^5.9.2",
"antd-img-crop": "^4.13.0",