jianjun
|
90575798dc
|
获取第三方token重试2次
|
4 years ago |
|
jianjun
|
e95d3a210d
|
Merge remote-tracking branch 'remotes/origin/dev_issue_category' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
4 years ago |
zhaoqifeng
|
9a0fd3f66e
|
Merge branch 'dev_thirdplatform' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
ec577333bf
|
httpclient读取数据超时时间修改
|
4 years ago |
sunyuchao
|
ef9706556e
|
Merge branch 'dev_ext_syc' into dev
|
4 years ago |
|
sunyuchao
|
638461aea7
|
返参调整
|
4 years ago |
|
sunyuchao
|
158a407d5f
|
Merge branch 'dev_ext_syc' into dev
|
4 years ago |
|
jianjun
|
3e83dcc772
|
Merge remote-tracking branch 'remotes/origin/dev_group_qrcode' into dev
|
4 years ago |
|
jianjun
|
5212a78c85
|
Merge remote-tracking branch 'remotes/origin/dev_wx_msg' into dev
|
4 years ago |
|
sunyuchao
|
077478a4ed
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
sunyuchao
|
74a3cf0757
|
Merge branch 'dev_ext_syc' into dev_temp
|
4 years ago |
yinzuomei
|
8e9800299e
|
Merge remote-tracking branch 'origin/dev_20210401_bug' into dev_temp
|
4 years ago |
|
jianjun
|
4b9ff3177d
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
1f88b8b961
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_user_cache' into dev
|
4 years ago |
|
yinzuomei
|
7e8e1e10d9
|
Merge remote-tracking branch 'origin/dev_20210401_bug' into dev
|
4 years ago |
|
sunyuchao
|
af654ba49c
|
外挂接口新增返参
|
4 years ago |
|
zhaoqifeng
|
deefd8f829
|
Merge branch 'dev_group_qrcode' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
f6edba2b83
|
小组审核生成二维码报错
|
4 years ago |
|
jianjun
|
d907cfbc28
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
4 years ago |
|
jianjun
|
5d9e7ed554
|
Merge branch 'dev_optimize_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
1760665358
|
处理用户基础信息 报错,设置默认空字符串
|
4 years ago |
|
jianjun
|
9dde86111f
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
863f625f27
|
处理用户基础信息 报错
|
4 years ago |
|
jianjun
|
b2e6a45541
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize_ljj
|
4 years ago |
|
yinzuomei
|
82a23663c1
|
添加注释
|
4 years ago |
zxc
|
d305c08aa5
|
平阴数据bug修复
|
4 years ago |
|
zxc
|
78151b1cc8
|
Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
|
4 years ago |
|
zxc
|
5b7705296b
|
可胜任组长-组员列表(工作端通用)
|
4 years ago |
zhangyongzhangyong
|
0fbc5218e7
|
Merge branch 'dev-customerfunction-bugfix' into dev_temp
|
4 years ago |
|
zhangyongzhangyong
|
b310170a70
|
定制功能列表 添加分页
|
4 years ago |
|
zxc
|
7d13eb5c40
|
Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
|
4 years ago |
|
zxc
|
e69ba7d130
|
可胜任组长-组员列表(工作端通用)
|
4 years ago |
wxz
|
8e54b66bfd
|
修改：openapi未传递token，则提示请求未认证
|
4 years ago |
|
jianjun
|
80e87810ad
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev
|
4 years ago |
|
jianjun
|
8bffdea291
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
d798d0fcd3
|
去掉调试日志
|
4 years ago |
|
jianjun
|
3abed293ef
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
|
jianjun
|
d9e065a062
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
|
4 years ago |
|
jianjun
|
7f22d27e2b
|
升级aliyun-sdk-oss
|
4 years ago |
wangchao
|
78fa18f510
|
Merge branch 'dev_bugfix_0329_whistled_project_count' into dev
|
4 years ago |
|
wangchao
|
dbb05814cc
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
wangchao
|
9ee62e3ced
|
Merge branch 'dev_bugfix_0329_whistled_project_count' into dev_temp
|
4 years ago |
|
wangchao
|
7d0333004a
|
修改评价周期内被吹哨项目数与评价周期内被办结项目数的算法
|
4 years ago |
|
yinzuomei
|
61ee86dce8
|
Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
|
4 years ago |
|
yinzuomei
|
852a7baf52
|
屏蔽话题默认理由修改
|
4 years ago |
|
jianjun
|
09bd400822
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
jianjun
|
6e612ee114
|
Merge branch 'dev_voice_attachment' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
568c600c90
|
重复提交使用@Before注解->还需要优化 本地缓存解决不了 分布式
|
4 years ago |
|
jianjun
|
ff8bea4200
|
删除无用代码
|
4 years ago |
|
wxz
|
da32d736c6
|
Merge branch 'dev_log_adjust' into dev_temp
|
4 years ago |
