Commit Graph

28 Commits

Author SHA1 Message Date
king
853c3f59c2 综合销售情况表 调整月度,年度 报表数据 2026-03-25 17:43:40 +08:00
chy
6e9bdfd81c 修改验证码水印 2026-03-23 11:20:13 +08:00
chy
eb410b992d 修改验证码水印 2026-03-22 22:01:25 +08:00
chy
21fe5196be 添加能耗采集定时任务 2026-03-13 09:58:32 +08:00
chy
eca53d5424 添加单点登录接口和退出接口 2026-03-11 00:23:07 +08:00
chy
32627270d1 添加单点登录接口和退出接口 2026-03-11 00:01:32 +08:00
chy
56cb31c616 根据tokne获取用户信息 2026-03-10 14:23:28 +08:00
chy
de1774b2d3 修改配置文件 2026-03-10 11:13:56 +08:00
chy
43e66ea9c6 根据ticket获取用户信息 2026-03-10 11:09:46 +08:00
hardy.liu
8bae1cbd35 销售明细表定时任务 2026-03-06 15:00:08 +08:00
chy
ee7510f41e 修改统一身份认证 2026-03-02 15:15:41 +08:00
chy
390172f426 合并hhl代码 2026-02-11 10:11:14 +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
8b9f4a5013 修改代码 2026-02-10 00:19:46 +08:00
chy
3de7be34b2 删除无用文件 2026-02-09 23:49:37 +08:00
chy
da95ddf810 合并董潘祥冲突 2026-02-09 23:44:07 +08:00
chy
72331c5e1e 合并20260204分支 2026-02-09 23:34:56 +08:00
chy
fa8c84f349 Merge branch '20260204'
# Conflicts:
#	.idea/compiler.xml
#	.idea/vcs.xml
#	lidee-admin/src/main/resources/application-local.yaml
#	lidee-admin/target/classes/application-local.yaml
#	lidee-admin/target/lidee-admin.jar
#	lidee-admin/target/lidee-admin.jar.original
#	lidee-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	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
#	lidee-core/target/lidee-core-2.2.4.jar
#	lidee-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-module/lidee-module-api/target/lidee-module-api-2.2.4.jar
#	lidee-module/lidee-module-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-module/lidee-module-biz/target/lidee-module-biz-2.2.4.jar
#	lidee-module/lidee-module-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-service/lidee-service-infra-api/target/lidee-service-infra-api-2.2.4.jar
#	lidee-service/lidee-service-infra-biz/target/lidee-service-infra-biz-2.2.4.jar
#	lidee-service/lidee-service-system-api/target/lidee-service-system-api-2.2.4.jar
#	lidee-service/lidee-service-system-biz/target/lidee-service-system-biz-2.2.4.jar
#	lidee-tool/tool-common/target/tool-common-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-ai/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-ai/target/tool-spring-boot-starter-ai-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-captcha/target/tool-spring-boot-starter-captcha-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-dict/target/tool-spring-boot-starter-dict-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-excel/target/tool-spring-boot-starter-excel-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-exception/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-exception/target/tool-spring-boot-starter-exception-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-file/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-file/target/tool-spring-boot-starter-file-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-flowable/target/tool-spring-boot-starter-flowable-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-ip/target/tool-spring-boot-starter-ip-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-job/target/tool-spring-boot-starter-job-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-monitor/target/tool-spring-boot-starter-monitor-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-mybatis/target/tool-spring-boot-starter-mybatis-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-operatelog/target/tool-spring-boot-starter-operatelog-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-permission/target/tool-spring-boot-starter-permission-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-protection/target/tool-spring-boot-starter-protection-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-redis/target/tool-spring-boot-starter-redis-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-security/target/tool-spring-boot-starter-security-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-sql/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-sql/target/tool-spring-boot-starter-sql-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-tenant/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-tenant/target/tool-spring-boot-starter-tenant-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-test/target/tool-spring-boot-starter-test-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-web/target/tool-spring-boot-starter-web-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-websocket/target/tool-spring-boot-starter-websocket-2.2.4.jar
#	lidee-tool/tool-spring-boot-starter-yunji/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	lidee-tool/tool-spring-boot-starter-yunji/target/tool-spring-boot-starter-yunji-2.2.4.jar
#	logs/lideeyunji-error.log
#	logs/lideeyunji-info.log
2026-02-09 23:30:06 +08:00
chy
16a985e8cc 修改 2026-02-09 11:14:17 +08:00
chy
55d050fbd7 111 2026-02-09 00:27:50 +08:00
chy
861f082e66 ·1 2026-02-09 00:16:21 +08:00
dongpx
b629c574f1 Changes 2026-02-08 22:20:56 +08:00
dongpx
918ec6c498 Changes 2026-02-05 13:20:41 +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
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