Commit Graph

20 Commits

Author SHA1 Message Date
chy
44279d9637 修改统一身份认证 2026-03-02 10:34:45 +08:00
c4ea4650bf Merge branch 'master' into main_hhl0209 2026-02-25 14:00:25 +08:00
chy
79cb1297db 修改认证 2026-02-22 21:40:47 +08:00
huhanlin
0cc088c51b 应用查询按字典排序值排序 2026-02-11 14:42:09 +08:00
chy
0f61e5b8f2 Merge remote-tracking branch '20260209/main_hhl0209'
# Conflicts:
#	lidee-admin/src/main/resources/application-local.yaml
2026-02-11 10:10:27 +08:00
huhanlin
909d9625cd 获得角色拥有的应用id接口权限修改 2026-02-10 15:21:16 +08:00
huhanlin
cd7bb5ccc5 应用权限功能 2026-02-10 14:22:55 +08:00
chy
bb986102f3 修改配置代码 2026-02-10 10:50:32 +08:00
chy
549da7ec80 应用表单增加回调url和应用分类字段,重定向url改为单个字符串 2026-02-10 10:35:11 +08:00
chy
3de7be34b2 删除无用文件 2026-02-09 23:49:37 +08:00
huhanlin
56e09151e4 应用表单增加回调url和应用分类字段,重定向url改为单个字符串 2026-02-09 14:50:42 +08:00
chy
c1a3e0f709 修改代码 2026-02-09 11:19:24 +08:00
chy
16a985e8cc 修改 2026-02-09 11:14:17 +08:00
chy
861f082e66 ·1 2026-02-09 00:16:21 +08:00
chy
81bc9757eb Merge remote-tracking branch 'remotes/origin/20260204'
# Conflicts:
#	lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.class
#	lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/codegen/CodegenConvertImpl.java
#	lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/config/ConfigConvertImpl.java
#	lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/file/FileConfigConvertImpl.java
#	lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/redis/RedisConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/auth/AuthConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/logger/OperateLogConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/mail/MailAccountConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/oauth2/OAuth2OpenConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/social/SocialUserConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/tenant/TenantConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/user/UserConvertImpl.java
2026-02-05 13:15:03 +08:00
chy
92674cff52 Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_java
Signed-off-by: chy <chy@163.com>
2026-02-05 13:12:17 +08:00
dongpx
b7ebd3778d Signed-off-by: dongpx <2112323174@qq.com> 2026-02-05 10:37:57 +08:00
dongpx
3c9eb35f2c Signed-off-by: dongpx <2112323174@qq.com> 2026-02-04 10:55:43 +08:00
chy
e392221045 更新董潘祥代码 2026-02-03 15:50:37 +08:00
chy
1c212fb3b3 Signed-off-by: chy <chy@163.com> 2026-02-02 23:21:53 +08:00