wangliwen
|
8844a9fdf2
|
Merge branch 'dev' into docker_package
|
2022-07-07 11:53:56 +08:00 |
|
wangliwen
|
fc715c9cd4
|
屮
|
2022-07-07 11:53:46 +08:00 |
|
wangliwen
|
816bf600ad
|
Merge branch 'dev' into docker_package
|
2022-07-07 11:38:51 +08:00 |
|
wangliwen
|
8371b085f4
|
。。。
|
2022-07-07 11:38:35 +08:00 |
|
wangliwen
|
d568739dfa
|
Merge branch 'dev' into docker_package
|
2022-07-07 10:29:51 +08:00 |
|
wangliwen
|
ac7f9f5b68
|
所有流程审核人为发起人时，默认审核通过
|
2022-07-07 10:29:28 +08:00 |
|
wangliwen
|
2dc4a978ed
|
Merge branch 'dev' into docker_package
|
2022-07-07 10:07:56 +08:00 |
|
wangliwen
|
08e3b2d09a
|
字体缺失，镜像内处理
|
2022-07-07 10:07:49 +08:00 |
|
wangliwen
|
03129a13c2
|
需求审核人为发起人时，默认通过
|
2022-07-07 10:04:06 +08:00 |
|
wangliwen
|
446a0928bc
|
容器内字体缺失
|
2022-07-07 09:54:02 +08:00 |
|
wangliwen
|
ceb5c5fdea
|
Merge branch 'dev' into docker_package
|
2022-07-06 17:58:36 +08:00 |
|
wangliwen
|
ec7da281e6
|
...
|
2022-07-06 17:58:24 +08:00 |
|
wangliwen
|
eaaac41e48
|
Merge branch 'dev' into docker_package
|
2022-07-06 17:47:04 +08:00 |
|
wangliwen
|
fb28534f56
|
工作台异常
|
2022-07-06 17:46:51 +08:00 |
|
wangliwen
|
f553d9de0b
|
Merge branch 'dev' into docker_package
|
2022-07-06 17:25:38 +08:00 |
|
wangliwen
|
fbb5fa3bc3
|
npe
|
2022-07-06 17:25:16 +08:00 |
|
wangliwen
|
17c54835f4
|
Merge branch 'dev' into docker_package
|
2022-07-06 16:30:18 +08:00 |
|
wangliwen
|
089ff2bb3a
|
npe
|
2022-07-06 16:30:07 +08:00 |
|
wangliwen
|
49d7d2d1f0
|
Merge branch 'master' into docker_package
|
2022-07-06 15:59:27 +08:00 |
|
wangliwen
|
c4bd9a2baa
|
部门待办防止重复
|
2022-07-06 15:56:12 +08:00 |
|
wangliwen
|
898e1c5ae5
|
浏览记录的处理
|
2022-07-06 15:45:12 +08:00 |
|
wangliwen
|
419ad451bd
|
浏览记录添加
|
2022-07-06 15:12:28 +08:00 |
|
wangliwen
|
e606ec0499
|
Merge branch 'master' into docker_package
|
2022-07-06 11:51:26 +08:00 |
|
wangliwen
|
0610457207
|
...
|
2022-07-06 11:03:27 +08:00 |
|
wangliwen
|
8da1f87d46
|
category/getCategoryTree 加上二级缓存
|
2022-07-06 10:30:22 +08:00 |
|
wangliwen
|
11829cfc75
|
dev配置调大连接池线程池数目
|
2022-07-06 10:22:55 +08:00 |
|
wangliwen
|
7141447306
|
。。。
|
2022-07-06 09:14:52 +08:00 |
|
wangliwen
|
11f2d4d835
|
容器内调试
|
2022-07-05 19:33:23 +08:00 |
|
wangliwen
|
45fb520d1a
|
...
|
2022-07-05 19:22:34 +08:00 |
|
wangliwen
|
8a2fa967e2
|
Merge branch 'master' into docker_package
|
2022-07-05 18:23:23 +08:00 |
|
wangliwen
|
6eb4596a66
|
...
|
2022-07-05 18:22:20 +08:00 |
|
wangliwen
|
a5418338a2
|
Merge branch 'master' into docker_package
|
2022-07-05 17:33:28 +08:00 |
 huangweixiong
|
079c3b4eb4
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
...
...
|
2022-07-05 17:19:44 +08:00 |
|
huangweixiong
|
9831f7725e
|
兼容能力主次表数据不一致
|
2022-07-05 17:19:00 +08:00 |
|
wangliwen
|
96cebb55ba
|
Merge remote-tracking branch 'origin/dev'
|
2022-07-05 16:54:10 +08:00 |
|
wangliwen
|
e57bc3feac
|
...
|
2022-07-05 16:53:32 +08:00 |
|
huangweixiong
|
45787c0fa3
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (22 commits)
1、修改/resource/selectTotal方法，在548行增加代码删除“基础设施”的数据
申购车脏数据处理（资源不存在时）
重复收藏时更新收藏时间
npe
需求 不展示问题
CompletableFuture 使用自定义线程池
使用自定义线程池
能力申请V2模型导入
姜永超增加应用上架关联组件；增加服务融合冗余接口，以后用的话可以用
常用校验token加上二级缓存
申购车摄像头sql
...
...
姜永超增加能力上架 组件类型关联应用
数据库死锁解决
1、修改能力统计列表和详情-知识库-知识库发布时间统计的sql
评论审核通过，通知评论人
更新日志文件
1、修改能力统计列表和详情-基础设施-发布情况列表的查询
。。。
...
# Conflicts:
# renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java
|
2022-07-05 16:50:36 +08:00 |
|
huangweixiong
|
0bd1259e6d
|
云图统计优化
|
2022-07-05 16:48:03 +08:00 |
|
wangliwen
|
b65abbdd04
|
...
|
2022-07-05 16:32:02 +08:00 |
|
wangliwen
|
4a6879b91a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-05 16:10:09 +08:00 |
 yitonglei
|
f1cb8158ea
|
1、修改/resource/selectTotal方法，在548行增加代码删除“基础设施”的数据
|
2022-07-05 16:08:08 +08:00 |
|
wangliwen
|
eb287b4f3d
|
Merge branch 'master' into docker_package
|
2022-07-05 15:57:47 +08:00 |
|
wangliwen
|
6276b29333
|
申购车脏数据处理（资源不存在时）
|
2022-07-05 15:26:13 +08:00 |
|
wangliwen
|
6b6ebf6fc1
|
重复收藏时更新收藏时间
|
2022-07-05 14:55:06 +08:00 |
|
wangliwen
|
d4d51f997a
|
npe
|
2022-07-05 14:42:34 +08:00 |
|
wangliwen
|
92c4658f76
|
需求 不展示问题
|
2022-07-05 14:32:20 +08:00 |
|
wangliwen
|
3d08431a33
|
Merge branch 'master' into docker_package
|
2022-07-05 14:21:03 +08:00 |
|
wangliwen
|
04365958fc
|
CompletableFuture 使用自定义线程池
|
2022-07-05 14:13:16 +08:00 |
|
wangliwen
|
a2e5a0d4ff
|
使用自定义线程池
|
2022-07-05 11:52:16 +08:00 |
|
wangliwen
|
c8ce2d4ce2
|
能力申请V2模型导入
|
2022-07-05 10:35:59 +08:00 |