jianjun
|
4644539c4e
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
8c394f2d4d
|
改为okhttp试试 看看是否还超时
|
5 years ago |
|
jianjun
|
b67b3b7d10
|
调整调用第三方日志 上线
|
5 years ago |
|
jianjun
|
2038793338
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
ead9dbf83d
|
调整调用第三方日志
|
5 years ago |
sunyuchao
|
8120b259c8
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
sunyuchao
|
534395d72d
|
添加客户Id功能上线
|
5 years ago |
|
jianjun
|
5c6c65913d
|
customerId修改外层版本号
|
5 years ago |
|
jianjun
|
bb773f3f22
|
上线：难点堵点-查询列表 如果内容为空则返回标题
|
5 years ago |
|
jianjun
|
b7056f638b
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
c50c132dcf
|
难点堵点-查询列表 如果内容为空则返回标题
|
5 years ago |
yinzuomei
|
fcf26d7df3
|
参观组发布
|
5 years ago |
wxz
|
18c7bc458e
|
版本升级
|
5 years ago |
|
wxz
|
162813755e
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
4e74c87786
|
Merge branch 'dev_openapi' into dev
|
5 years ago |
|
yinzuomei
|
8f45230cc3
|
Merge remote-tracking branch 'origin/dev_visit_group' into dev
|
5 years ago |
|
wxz
|
5186720b1d
|
重新添加误删的模块
|
5 years ago |
|
sunyuchao
|
3f5e3c665a
|
dev分支合到dev_add_customer_id分支
|
5 years ago |
|
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 |
|
wxz
|
e27fbc3c1a
|
修改：openApi验签部分，修改返回提示
|
5 years ago |
|
wxz
|
0556718666
|
Merge branch 'dev' into dev_openapi
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.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 |
|
jianjun
|
682a706926
|
bugfix 获取去过该客户下的网格 列表
|
5 years ago |
|
jianjun
|
2f98df9bad
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
zxc
|
fcd2092c73
|
列表展示，当前用户，在当前客户下访问过的网格bug
|
5 years ago |
|
jianjun
|
74bab40993
|
日志级别调整
|
5 years ago |
|
yinzuomei
|
e0291b6e61
|
获取当前在组模式（发话题、分享、评论时调用）调整
|
5 years ago |
|
yinzuomei
|
14d5bb7a15
|
获取当前在组模式（发话题、分享、评论时调用）调整
|
5 years ago |
|
yinzuomei
|
49c95a791c
|
获取当前在组模式（发话题、分享、评论时调用）调整
|
5 years ago |
|
yinzuomei
|
e7fcddb361
|
获取当前在组模式（发话题、分享、评论时调用）调整
|
5 years ago |
|
yinzuomei
|
4ae9d0e60f
|
工作日志大屏接口调整
|
5 years ago |
|
yinzuomei
|
7fce9cdfa2
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
2421497245
|
Merge remote-tracking branch 'origin/dev_workrec' into dev
|
5 years ago |
|
yinzuomei
|
fd08a6f32b
|
工作日志接口修改
|
5 years ago |
|
jianjun
|
37917852ac
|
项目外转功能上线：project third
|
5 years ago |
|
jianjun
|
535e34821e
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
fef02103ba
|
添加表描述
|
5 years ago |
|
jianjun
|
fbaf0eb883
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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 |
|
zxc
|
4b303826f2
|
获取当前在组模式（发话题、分享、评论时调用）
参观小组(记录日志)
|
5 years ago |
|
yinzuomei
|
975d4511e6
|
setvisitswitch
|
5 years ago |
zhaoqifeng
|
3ea9d2738a
|
小组管理-设置是否允许参观
小组管理-界面初始化
|
5 years ago |
|
yinzuomei
|
e1bbddcde2
|
修改版本号
|
5 years ago |
|
yinzuomei
|
5bddd70179
|
创建小组接口调整
|
5 years ago |
