sunyuchao
|
f2c489bd69
|
Merge branch 'dev_project_approval' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
|
5 years ago |
wxz
|
e3859f1f13
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wxz
|
af4e5489b4
|
Merge branch 'dev_openapi' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
wxz
|
5186720b1d
|
重新添加误删的模块
|
5 years ago |
zxc
|
065ce35f5e
|
事件分析组织-月 统计 微调
|
5 years ago |
|
wxz
|
e27fbc3c1a
|
修改：openApi验签部分，修改返回提示
|
5 years ago |
|
zxc
|
ecb8426bdf
|
事件分析组织-天 统计 添加组织立项逻辑
|
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 |
|
sunyuchao
|
789470302f
|
项目立项
|
5 years ago |
|
sunyuchao
|
8e8590ae49
|
项目详情接口添加返参
|
5 years ago |
|
sunyuchao
|
11574ab7b7
|
项目立项
|
5 years ago |
zhangyongzhangyong
|
3c9650f61b
|
Merge branch 'dev_isDomainName' into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
e69aa0f838
|
[定制功能 ] 表增加IS_DOMAIN_NAME字段
|
5 years ago |
|
zxc
|
ab371e04ec
|
备注添加
|
5 years ago |
|
zxc
|
95401d69e7
|
网格办结项目数修改
|
5 years ago |
zhaoqifeng
|
1372bffd2f
|
项目主表网格相关sql修改，主表数据提取修改
|
5 years ago |
|
zxc
|
5a6c46bb57
|
网格自治项目数修改
|
5 years ago |
yinzuomei
|
e71ca4ca8b
|
Merge branch 'dev_0409yzm' into dev
|
5 years ago |
|
sunyuchao
|
f60575c8c9
|
项目立项project表添加字段
|
5 years ago |
|
yinzuomei
|
eeee230cb0
|
添加注释
|
5 years ago |
|
sunyuchao
|
ca659b6d97
|
项目立项-可选组织树查询
|
5 years ago |
jianjun
|
18c8d2aa7d
|
代码微调
|
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
|
bf9ba642b0
|
Merge remote-tracking branch 'origin/dev_bug_2021408' into dev_temp
# 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 |
|
zxc
|
fcd2092c73
|
列表展示，当前用户，在当前客户下访问过的网格bug
|
5 years ago |
|
jianjun
|
74bab40993
|
日志级别调整
|
5 years ago |
|
yinzuomei
|
a2387f1980
|
Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
|
5 years ago |
|
yinzuomei
|
e0291b6e61
|
获取当前在组模式（发话题、分享、评论时调用）调整
|
5 years ago |
|
yinzuomei
|
59dca31978
|
Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
|
5 years ago |
|
yinzuomei
|
14d5bb7a15
|
获取当前在组模式（发话题、分享、评论时调用）调整
|
5 years ago |
|
yinzuomei
|
49c95a791c
|
获取当前在组模式（发话题、分享、评论时调用）调整
|
5 years ago |
|
yinzuomei
|
05e8816aff
|
Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
|
5 years ago |
|
yinzuomei
|
e7fcddb361
|
获取当前在组模式（发话题、分享、评论时调用）调整
|
5 years ago |
|
yinzuomei
|
2421497245
|
Merge remote-tracking branch 'origin/dev_workrec' into dev
|
5 years ago |
|
yinzuomei
|
5b37248bae
|
Merge remote-tracking branch 'origin/dev_workrec' into dev_temp
|
5 years ago |
|
yinzuomei
|
fd08a6f32b
|
工作日志接口修改
|
5 years ago |
|
yinzuomei
|
71f15fa58d
|
Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
|
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 |
|
zxc
|
4b303826f2
|
获取当前在组模式（发话题、分享、评论时调用）
参观小组(记录日志)
|
5 years ago |
|
yinzuomei
|
975d4511e6
|
setvisitswitch
|
5 years ago |
|
yinzuomei
|
4a476a9272
|
Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
3ea9d2738a
|
小组管理-设置是否允许参观
小组管理-界面初始化
|
5 years ago |
|
yinzuomei
|
5e26b93807
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_temp
|
5 years ago |
|
yinzuomei
|
e1bbddcde2
|
修改版本号
|
5 years ago |
|
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
|
5 years ago |
