king
|
8523b80eb3
|
分组SQL调整
|
2026-03-10 15:38:16 +08:00 |
|
king
|
b6a6ad88e7
|
分组SQL调整
|
2026-03-10 15:04:48 +08:00 |
|
king
|
3c1274c3d6
|
Merge branch 'master' into dev_js_20260309
|
2026-03-10 14:37:07 +08:00 |
|
king
|
b021d2ef01
|
删除打印
|
2026-03-10 14:36:06 +08:00 |
|
|
|
2fa40c266f
|
Merge pull request '实现前置增强逻辑，再实现“综合销售情况表” 动态分组逻辑' (#25) from dev_js_20260309 into master
Reviewed-on: #25
|
2026-03-10 14:32:51 +08:00 |
|
|
|
56cb31c616
|
根据tokne获取用户信息
|
2026-03-10 14:23:28 +08:00 |
|
king
|
1c9d3b831c
|
实现前置增强逻辑，再实现“综合销售情况表” 动态分组逻辑
|
2026-03-10 14:13:57 +08:00 |
|
|
|
de1774b2d3
|
修改配置文件
|
2026-03-10 11:13:56 +08:00 |
|
|
|
43e66ea9c6
|
根据ticket获取用户信息
|
2026-03-10 11:09:46 +08:00 |
|
|
|
f494611789
|
Merge pull request '销售明细表定时任务' (#24) from liug into master
Reviewed-on: #24
|
2026-03-06 23:01:12 +08:00 |
|
hardy.liu
|
8bae1cbd35
|
销售明细表定时任务
|
2026-03-06 15:00:08 +08:00 |
|
|
|
ee7510f41e
|
修改统一身份认证
|
2026-03-02 15:15:41 +08:00 |
|
|
|
44279d9637
|
修改统一身份认证
|
2026-03-02 10:34:45 +08:00 |
|
|
|
860afb9812
|
Merge pull request '新增字段' (#23) from dpx20260211 into master
Reviewed-on: #23
|
2026-02-28 08:44:07 +08:00 |
|
dongpx
|
0ef88ce81d
|
新增字段
|
2026-02-28 08:24:32 +08:00 |
|
|
|
1b81782767
|
Merge pull request '应用查询按字典排序值排序' (#21) from main_hhl0209 into master
Reviewed-on: #21
|
2026-02-25 14:01:54 +08:00 |
|
|
|
432feb11d2
|
Merge pull request 'dpx20260211' (#22) from dpx20260211 into master
Reviewed-on: #22
|
2026-02-25 14:01:28 +08:00 |
|
|
|
c4ea4650bf
|
Merge branch 'master' into main_hhl0209
|
2026-02-25 14:00:25 +08:00 |
|
dongpx
|
1173de364c
|
新增字段
|
2026-02-25 10:06:15 +08:00 |
|
|
|
79cb1297db
|
修改认证
|
2026-02-22 21:40:47 +08:00 |
|
dongpx
|
7fb9543604
|
新增字段
|
2026-02-14 00:38:17 +08:00 |
|
dongpx
|
bac75778ad
|
修改字段长度
|
2026-02-12 11:45:36 +08:00 |
|
dongpx
|
3dd11b9f37
|
新增字段
|
2026-02-12 08:38:19 +08:00 |
|
|
|
f940b2a911
|
新增文档
|
2026-02-11 14:58:26 +08:00 |
|
huhanlin
|
0cc088c51b
|
应用查询按字典排序值排序
|
2026-02-11 14:42:09 +08:00 |
|
|
|
869ef2cd8b
|
Merge pull request 'ceshi' (#20) from dpx20260211 into master
Reviewed-on: #20
|
2026-02-11 11:35:01 +08:00 |
|
dongpx
|
35d708612e
|
ceshi
|
2026-02-11 11:33:57 +08:00 |
|
|
|
dcb15b1aa7
|
是否隐藏列
|
2026-02-11 11:18:38 +08:00 |
|
|
|
390172f426
|
合并hhl代码
|
2026-02-11 10:11:14 +08:00 |
|
|
|
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 |
|
|
|
bb986102f3
|
修改配置代码
|
2026-02-10 10:50:32 +08:00 |
|
|
|
2cae542098
|
新增维度隐藏字段
|
2026-02-10 10:42:42 +08:00 |
|
|
|
549da7ec80
|
应用表单增加回调url和应用分类字段，重定向url改为单个字符串
|
2026-02-10 10:35:11 +08:00 |
|
|
|
8b9f4a5013
|
修改代码
|
2026-02-10 00:19:46 +08:00 |
|
|
|
3de7be34b2
|
删除无用文件
|
2026-02-09 23:49:37 +08:00 |
|
|
|
e0dd2a59ec
|
合并董潘祥冲突
|
2026-02-09 23:45:51 +08:00 |
|
|
|
da95ddf810
|
合并董潘祥冲突
|
2026-02-09 23:44:07 +08:00 |
|
|
|
c8b73763bb
|
Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_java
# Conflicts:
# lidee-admin/src/main/resources/application-local.yaml
# lidee-admin/target/classes/application-local.yaml
# lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/entity/OAuth2ClientDO.java
# lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2ClientServiceImpl.java
|
2026-02-09 23:43:07 +08:00 |
|
|
|
72331c5e1e
|
合并20260204分支
|
2026-02-09 23:34:56 +08:00 |
|
|
|
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 |
|
|
|
e70fa733ef
|
Merge pull request 'main_hhl0209' (#10) from main_hhl0209 into main
Reviewed-on: #10
|
2026-02-09 23:12:58 +08:00 |
|
dongpx
|
246591bb1c
|
Signed-off-by: dongpx <2112323174@qq.com>
|
2026-02-09 20:12:51 +08:00 |
|
huhanlin
|
56e09151e4
|
应用表单增加回调url和应用分类字段，重定向url改为单个字符串
|
2026-02-09 14:50:42 +08:00 |
|
huhanlin
|
7a9ae35c18
|
测试提交
|
2026-02-09 12:17:06 +08:00 |
|
|
|
c1a3e0f709
|
修改代码
|
2026-02-09 11:19:24 +08:00 |
|
|
|
16a985e8cc
|
修改
|
2026-02-09 11:14:17 +08:00 |
|
|
|
55d050fbd7
|
111
|
2026-02-09 00:27:50 +08:00 |
|
|
|
861f082e66
|
·1
|
2026-02-09 00:16:21 +08:00 |
|
