yinzuomei
|
9d1298ec4c
|
Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
|
4 years ago |
|
yinzuomei
|
5bddd70179
|
创建小组接口调整
|
4 years ago |
sunyuchao
|
bd6749f428
|
Merge branch 'dev_add_customer_id' into dev_temp
|
4 years ago |
|
sunyuchao
|
3d30bc5723
|
项目滞留短信推送逻辑调整
|
4 years ago |
|
yinzuomei
|
97914ad8d3
|
groupvisitor漏题
|
4 years ago |
|
yinzuomei
|
1b2bec280e
|
生成代码提交
|
4 years ago |
|
yinzuomei
|
cd1661ed73
|
参观组sql脚本
|
4 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
|
4 years ago |
|
sunyuchao
|
a67c8529a8
|
Merge branch 'dev_add_customer_id' into dev_temp
|
4 years ago |
|
sunyuchao
|
2baa2c0a63
|
测试短信发送内容
|
4 years ago |
zhaoqifeng
|
d99618d433
|
项目发送到第三方平台
|
4 years ago |
|
yinzuomei
|
6f1f2baeee
|
Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
|
4 years ago |
|
yinzuomei
|
0441b84afa
|
评论列表接口调整
|
4 years ago |
|
yinzuomei
|
09a25d486a
|
Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
|
4 years ago |
|
yinzuomei
|
0e76d4f322
|
ResiGroupMemberRedis.get方法修改
|
4 years ago |
|
yinzuomei
|
1c47e0779a
|
setCacheUserInfoWithIssue 方法修改
|
4 years ago |
jianjun
|
55acd7c84a
|
Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev_temp
|
4 years ago |
|
jianjun
|
8d10c15bcb
|
调用第三方打印日志；项目回调地址 动态生成
|
4 years ago |
|
yinzuomei
|
505e8c3826
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev
|
4 years ago |
zxc
|
ca04217a19
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
4 years ago |
|
zxc
|
9a3e7296fc
|
项目分类bug修复
|
4 years ago |
|
yinzuomei
|
5b01db5e9d
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev
|
4 years ago |
|
zhaoqifeng
|
7fd52560d5
|
项目发送到第三方平台
|
4 years ago |
|
zxc
|
79c0991405
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
4 years ago |
|
zxc
|
0d83b40532
|
统计
|
4 years ago |
|
zhaoqifeng
|
c6750d20ed
|
Merge branch 'dev_thirdplatform' into dev_temp
|
4 years ago |
|
sunyuchao
|
894dc584b3
|
解决sql脚本冲突问题
|
4 years ago |
|
sunyuchao
|
cda2332c13
|
Merge branch 'dev_issue_category' into dev
|
4 years ago |
|
sunyuchao
|
87e0cb75df
|
解决sql脚本冲突问题
|
4 years ago |
|
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 |
