sunyuchao
|
b53b94cc49
|
Merge branches 'dev' and 'dev_add_customer_id' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_add_customer_id
Conflicts:
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
|
5 years ago |
yinzuomei
|
e71ca4ca8b
|
Merge branch 'dev_0409yzm' into dev
|
5 years ago |
|
yinzuomei
|
eeee230cb0
|
添加注释
|
5 years ago |
zhangyongzhangyong
|
b34912b465
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhangyongzhangyong
|
6ceb2eca49
|
第三方平台-接口
|
5 years ago |
wxz
|
894dd33d5d
|
修改：参数校验，打印error改为打印warn
|
5 years ago |
zxc
|
fcd2092c73
|
列表展示，当前用户，在当前客户下访问过的网格bug
|
5 years ago |
jianjun
|
74bab40993
|
日志级别调整
|
5 years ago |
|
yinzuomei
|
2421497245
|
Merge remote-tracking branch 'origin/dev_workrec' into dev
|
5 years ago |
|
yinzuomei
|
fd08a6f32b
|
工作日志接口修改
|
5 years ago |
|
jianjun
|
fef02103ba
|
添加表描述
|
5 years ago |
|
jianjun
|
4441505ddc
|
Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev
# Conflicts:
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
|
5 years ago |
|
sunyuchao
|
d22fc97262
|
解决--6、【工作日志】支部建设、联建共建近12月趋势图--接口返回横坐标包含当前月问题
|
5 years ago |
|
yinzuomei
|
19e8c3e9e8
|
工作日志接口修改
|
5 years ago |
|
yinzuomei
|
e1bbddcde2
|
修改版本号
|
5 years ago |
|
sunyuchao
|
3d30bc5723
|
项目滞留短信推送逻辑调整
|
5 years ago |
|
yinzuomei
|
ab21037c3a
|
Merge remote-tracking branch 'origin/dev_group0329' into dev
# Conflicts:
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
|
5 years ago |
|
sunyuchao
|
2baa2c0a63
|
测试短信发送内容
|
5 years ago |
zhaoqifeng
|
d99618d433
|
项目发送到第三方平台
|
5 years ago |
|
yinzuomei
|
0441b84afa
|
评论列表接口调整
|
5 years ago |
|
yinzuomei
|
0e76d4f322
|
ResiGroupMemberRedis.get方法修改
|
5 years ago |
|
yinzuomei
|
1c47e0779a
|
setCacheUserInfoWithIssue 方法修改
|
5 years ago |
|
jianjun
|
8d10c15bcb
|
调用第三方打印日志；项目回调地址 动态生成
|
5 years ago |
|
yinzuomei
|
505e8c3826
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev
|
5 years ago |
|
zxc
|
9a3e7296fc
|
项目分类bug修复
|
5 years ago |
|
yinzuomei
|
5b01db5e9d
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev
|
5 years ago |
|
zhaoqifeng
|
7fd52560d5
|
项目发送到第三方平台
|
5 years ago |
|
zxc
|
0d83b40532
|
统计
|
5 years ago |
|
sunyuchao
|
894dc584b3
|
解决sql脚本冲突问题
|
5 years ago |
|
sunyuchao
|
cda2332c13
|
Merge branch 'dev_issue_category' into dev
|
5 years ago |
|
sunyuchao
|
87e0cb75df
|
解决sql脚本冲突问题
|
5 years ago |
|
jianjun
|
90575798dc
|
获取第三方token重试2次
|
5 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
|
5 years ago |
|
zhaoqifeng
|
ec577333bf
|
httpclient读取数据超时时间修改
|
5 years ago |
|
sunyuchao
|
ef9706556e
|
Merge branch 'dev_ext_syc' into dev
|
5 years ago |
|
sunyuchao
|
638461aea7
|
返参调整
|
5 years ago |
|
sunyuchao
|
158a407d5f
|
Merge branch 'dev_ext_syc' into dev
|
5 years ago |
|
jianjun
|
3e83dcc772
|
Merge remote-tracking branch 'remotes/origin/dev_group_qrcode' into dev
|
5 years ago |
|
jianjun
|
5212a78c85
|
Merge remote-tracking branch 'remotes/origin/dev_wx_msg' into dev
|
5 years ago |
|
jianjun
|
4b9ff3177d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
jianjun
|
1f88b8b961
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_user_cache' into dev
|
5 years ago |
|
yinzuomei
|
7e8e1e10d9
|
Merge remote-tracking branch 'origin/dev_20210401_bug' into dev
|
5 years ago |
|
sunyuchao
|
af654ba49c
|
外挂接口新增返参
|
5 years ago |
|
zhaoqifeng
|
f6edba2b83
|
小组审核生成二维码报错
|
5 years ago |
|
jianjun
|
d907cfbc28
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
5 years ago |
|
jianjun
|
1760665358
|
处理用户基础信息 报错,设置默认空字符串
|
5 years ago |
|
jianjun
|
863f625f27
|
处理用户基础信息 报错
|
5 years ago |
|
jianjun
|
b2e6a45541
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize_ljj
|
5 years ago |
|
yinzuomei
|
82a23663c1
|
添加注释
|
5 years ago |
|
zxc
|
d305c08aa5
|
平阴数据bug修复
|
5 years ago |
