zxc
|
29c83bde34
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
1f5afb7bd2
|
徽章修改
|
5 years ago |
zhaoqifeng
|
27d6756a1b
|
徽章个数不超过5个
|
5 years ago |
wangchao
|
b6bbde9101
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
b6edd849d6
|
议题重新编辑 新议题标题、建议覆盖原来
|
5 years ago |
|
zxc
|
b518938b76
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
zxc
|
7fd94101a7
|
议题审核历史
|
5 years ago |
sunyuchao
|
94cee852ae
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
sunyuchao
|
985f395d5f
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
zxc
|
d14d99d9b2
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
zxc
|
27d55382bd
|
议题审核详情
|
5 years ago |
liushaowen
|
2a9e44cda0
|
外挂发送订阅优化
|
5 years ago |
|
liushaowen
|
bd55f7f308
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
liushaowen
|
1058ce65e5
|
运营端查询建议列表优化
|
5 years ago |
|
wangchao
|
ec31f2f8fe
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
37ddacee53
|
议题提交修改
|
5 years ago |
|
wangchao
|
06ca00cdea
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
7688d0f79e
|
议题审核时日期的精度
|
5 years ago |
|
wangchao
|
5716428605
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
3d38a2837a
|
修复二次提交议题
|
5 years ago |
|
liushaowen
|
d333748dc3
|
Merge branch 'dev_temp' of http://121.42.41.42:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
liushaowen
|
d8e89a1685
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
liushaowen
|
fc984fb013
|
微信订阅外挂bug修复
|
5 years ago |
|
zxc
|
5f483565ed
|
先生/女士 修改
|
5 years ago |
|
wangchao
|
248d052b74
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
79e4db6e26
|
二次提交时不新增application_history
|
5 years ago |
|
wangchao
|
fce9e5c236
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
|
5 years ago |
|
zxc
|
9e085cc604
|
feign调用添加判断
|
5 years ago |
wxz
|
a9efa6e4d6
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wxz
|
cd014fc47e
|
文案写错(已转项目写成已转议题)修改
|
5 years ago |
|
wangchao
|
b74341e5f0
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
a859a7a364
|
mybatis sql过滤器修改
|
5 years ago |
|
wangchao
|
99853fce36
|
openFeign修改
|
5 years ago |
|
wangchao
|
81c006e168
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java
# epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
|
5 years ago |
|
wangchao
|
acd1cee757
|
议题审核
|
5 years ago |
yinzuomei
|
cd4c710fbf
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
yinzuomei
|
65b8ac45f2
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
zxc
|
1775c4516b
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
0c9515018d
|
徽章修改
|
5 years ago |
|
yinzuomei
|
6235c4e920
|
个人中心-我发起的议题-审核中列表接口
|
5 years ago |
|
sunyuchao
|
9bd2c7fee9
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
sunyuchao
|
cffbb48e23
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
sunyuchao
|
8a9d6e1909
|
旧接口程序完善
|
5 years ago |
|
zxc
|
bf09f011f2
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
de55c79642
|
徽章排序修改，提交审核添加校验
|
5 years ago |
jianjun
|
acced80c6d
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
jianjun
|
9c160e3290
|
修改合并错误
|
5 years ago |
|
zxc
|
7d6f4b4921
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
4c9f872ecf
|
徽章修改
|
5 years ago |
|
yinzuomei
|
3fc38ecffa
|
issue_application、issue_application_history 新增auto_passed:自动通过
|
5 years ago |
