Commit Graph

64 Commits

Author SHA1 Message Date
bb4432e643 提交 2025-07-09 18:19:13 +08:00
3d072958d6 提交 2025-06-18 18:30:01 +08:00
98bb3529ea 提交 2025-06-18 17:14:27 +08:00
e384dc1163 Merge branch 'refs/heads/develop' into feature/zijie
# Conflicts:
#	tashow-module/tashow-module-app/pom.xml
#	tashow-module/tashow-module-system/src/main/resources/application-local.yaml
2025-06-09 14:58:46 +08:00
c2adf5155f 调整 2025-06-04 18:31:22 +08:00
a55fa06c74 删除依赖 2025-06-04 17:11:07 +08:00
731eaf3629 删除文档 修改dockerfile文件 2025-06-04 15:18:17 +08:00
f9cfaced05 删除swagger侵入式代码 , 删除demo 2025-06-04 15:08:06 +08:00
3af438bcb7 Merge remote-tracking branch 'origin/feature/app-1.0.0' into feature/zijie 2025-05-30 17:50:21 +08:00
8e2c28ef36 提交 2025-05-30 17:49:57 +08:00
d010e55b76 提交 2025-05-26 17:58:35 +08:00
71519a730b 还原子杰代码 2025-05-26 17:50:49 +08:00
8cbbe932f2 调整框架,删除不必要的组件,添加sdk模块 2025-05-26 17:49:38 +08:00
534e0e9885 调整框架,删除不必要的组件,添加sdk模块 2025-05-26 17:45:24 +08:00
4dbc31d4b1 Merge remote-tracking branch 'origin/develop' into develop 2025-05-26 17:45:02 +08:00
c7c29c0663 调整框架,删除不必要的组件,添加sdk模块 2025-05-26 17:44:27 +08:00
4708c10358 Merge branch 'feature/zijie' of http://gitea.tashowz.com/tashow/tashow-platform into feature/zijie
# Conflicts:
#	tashow-dependencies/pom.xml
#	tashow-module/pom.xml
#	tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml
2025-05-26 17:37:29 +08:00
873921c6b1 Merge branch 'develop' of http://gitea.tashowz.com/tashow/tashow-platform into develop 2025-05-26 17:36:32 +08:00
f12339296a aaa
# Conflicts:
#	tashow-module/pom.xml
2025-05-26 17:33:07 +08:00
55a99fdf7b 提交 2025-05-26 17:24:48 +08:00
0d168cc260 提交 2025-05-26 17:24:20 +08:00
9516e50d72 Merge pull request 'feature/app-1.0.0' (#3) from feature/app-1.0.0 into develop
Reviewed-on: #3
2025-05-23 10:25:27 +00:00
8c8faacee3 Merge pull request 'Merge pull request 'feature/app-1.0.0' (#1) from feature/app-1.0.0 into develop' (#2) from develop into feature/app-1.0.0
Reviewed-on: #2
2025-05-23 10:22:28 +00:00
6bcdc812d2 Merge branch 'feature/app-1.0.0' into develop 2025-05-23 18:21:27 +08:00
2955d028ef 调整框架,删除不必要的组件,添加sdk模块 2025-05-23 18:21:04 +08:00
d63cc2396a 调整框架,删除不必要的组件,添加sdk模块 2025-05-23 17:30:37 +08:00
e2411f5014 调整框架,删除不必要的组件 2025-05-23 10:34:33 +08:00
ce2a28e154 调整框架,删除不必要的组件 2025-05-22 18:02:25 +08:00
56e2df9dc1 Merge pull request 'feature/app-1.0.0' (#1) from feature/app-1.0.0 into develop
Reviewed-on: #1
2025-05-22 08:49:03 +00:00
49a339292b 调整框架,删除不必要的组件 2025-05-22 16:35:24 +08:00
1d56a5e727 调整框架,删除不必要的组件 2025-05-22 16:26:40 +08:00
399de47e0b 调整框架,删除不必要的组件 2025-05-22 15:54:04 +08:00
5ffe1d489f 调整框架,删除不必要的组件 2025-05-22 15:03:46 +08:00
5bf210cbf4 还原初始模块 2025-05-21 17:30:23 +08:00
c3833e2903 还原初始模块 2025-05-21 16:44:30 +08:00
a8de1471d9 还原初始模块 2025-05-21 16:42:09 +08:00
aecb429fb8 还原初始模块 2025-05-21 16:40:49 +08:00
179567564f 还原初始模块 2025-05-21 16:40:37 +08:00
bee2525c63 还原初始模块 2025-05-21 16:40:25 +08:00
5f872f9eab 还原初始模块 2025-05-21 11:55:50 +08:00
1299cacf2b 还原 2025-05-21 11:40:09 +08:00
2bbecd241a 提交 2025-05-21 11:24:15 +08:00
6010f4efe9 提交 2025-05-21 11:16:48 +08:00
ca4fdc9f78 测试提交 2025-05-21 11:12:15 +08:00
01671a3ed2 提交 2025-04-22 15:23:13 +08:00
xuelijun
0e5639715e 1:产品模块添加 2:添加Es测试 2025-04-21 11:16:24 +08:00
e731ef8bcd 提交 2025-04-19 17:31:40 +08:00
xuelijun
98f55d2d09 es 2025-04-19 14:50:56 +08:00
344067d314 调整 修改配置文件 2025-04-19 14:41:15 +08:00
1edcc680d6 调整 修改配置文件 2025-04-18 18:12:17 +08:00