huhanlin
|
7a9ae35c18
|
测试提交
|
2026-02-09 12:17:06 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4f0e1bc860
|
Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_java
# Conflicts:
# lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java
# lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java
# lidee-core/target/classes/com/lideeyunji/core/framework/entity/ReportFieldEntity.class
# lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.class
|
2026-02-05 07:22:03 +08:00 |
|
dongpx
|
a1c91f2959
|
测试提交分支
Signed-off-by: dongpx <2112323174@qq.com>
|
2026-02-04 11:05:43 +08:00 |
|
dongpx
|
4cf2e2e90c
|
更新
Signed-off-by: dongpx <2112323174@qq.com>
|
2026-02-04 11:00:05 +08:00 |
|
dongpx
|
3c9eb35f2c
|
Signed-off-by: dongpx <2112323174@qq.com>
|
2026-02-04 10:55:43 +08:00 |
|
|
|
e392221045
|
更新董潘祥代码
|
2026-02-03 15:50:37 +08:00 |
|
|
|
1c212fb3b3
|
Signed-off-by: chy <chy@163.com>
|
2026-02-02 23:21:53 +08:00 |
|
