zhaoqifeng
|
62ef8c0cda
|
Merge branch 'dev_bugfix' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
577784acf6
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
0c0f18b533
|
我参与的议题-修改
|
5 years ago |
|
zhaoqifeng
|
62f019c942
|
个人信息修改-添加昵称修改
|
5 years ago |
|
zhaoqifeng
|
4df79724ef
|
账号安全 获取手机号不返回null
|
5 years ago |
wxz
|
cc24b33fa1
|
修复：我创建的话题列表，网格id为空的空指针错误
|
5 years ago |
|
wxz
|
5e1eb99678
|
Merge branch 'dev_personal_center' into dev
|
5 years ago |
wangchao
|
8874855fb6
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
03e2a65a3e
|
热心居民认证时，刷新该用户所在所有组缓存的热心居民数
|
5 years ago |
|
wangchao
|
7e66372dfa
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
wangchao
|
5bfa0689ee
|
取消或点亮徽章时强一致性
|
5 years ago |
|
wangchao
|
a19d98e418
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
db5237d291
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
wangchao
|
ee74b9c0af
|
取消或点亮徽章时强一致性
|
5 years ago |
|
wxz
|
5eb1e57c21
|
Merge branch 'dev_group_code' into dev_temp
|
5 years ago |
|
wxz
|
c9e729b7ab
|
测试获取请求域名端口
|
5 years ago |
|
wangchao
|
1abe8d3419
|
queryGroupProcessingCount空指针问题
|
5 years ago |
|
wangchao
|
edb31e6f05
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
cd9d601771
|
话题转移提兼容原有接口
|
5 years ago |
|
wxz
|
e5921f61fe
|
Merge branch 'dev_group_code' into dev_temp
|
5 years ago |
|
wxz
|
8bb2df597a
|
修复：HttpContextutils.getRequestServerNameAndPort()支持从nginx获取X-Forwarded-Scheme头
|
5 years ago |
|
wxz
|
86b8bf699f
|
Merge branch 'dev_group_code' into dev_temp
|
5 years ago |
|
wxz
|
692aede971
|
修改：测试请求信息的方法
|
5 years ago |
|
wxz
|
7add925bff
|
Merge branch 'dev_bugfix' into dev_temp
|
5 years ago |
|
wxz
|
cba96c4487
|
修复：【提交小组信息编辑】,修复只有党员身份无法编辑小组的问题
|
5 years ago |
|
wangchao
|
c83440a0b3
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
295e82fee6
|
修复了议题审核开关关闭时的问题
|
5 years ago |
yinzuomei
|
1d74a1aa73
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
yinzuomei
|
cc9e2c2981
|
issue_customer_parameter 默认audit_switch开关是关闭
|
5 years ago |
|
wxz
|
bc6f097a4f
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
wxz
|
b6d24aab05
|
修复：【我创建的话题(已转议题)】接口，没有查询到项目的情况下空指针异常
|
5 years ago |
|
zhaoqifeng
|
5a630f86b9
|
组织下有网格，不允许删除
|
5 years ago |
|
zhaoqifeng
|
11456560d3
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
2d97dbfd60
|
防止重复提交
|
5 years ago |
sunyuchao
|
7d4a3b6f33
|
Merge branch 'dev_bugfix' into dev_temp
|
5 years ago |
|
sunyuchao
|
b27295beee
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
sunyuchao
|
ea0bafb0ec
|
外挂接口添加返参
|
5 years ago |
|
sunyuchao
|
ab6eea084c
|
外挂接口添加返参
|
5 years ago |
|
zhaoqifeng
|
4013ccce9d
|
徽章审核驳回消息修改
|
5 years ago |
zxc
|
c8f227d594
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
wangchao
|
68a4284f27
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
zxc
|
74ef1a6290
|
徽章修改
|
5 years ago |
|
wangchao
|
e63721dc5c
|
updateTimeFill
|
5 years ago |
|
zxc
|
abcaf53241
|
徽章修改
|
5 years ago |
|
wangchao
|
ccdf385ad4
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
fc47a49be5
|
updateFills时updatedTime为空再取now();insertFill时updatedBy为空去找createdBy没有再找从httpRequest中获取userId。如果不想被处理sql，insert或update时不要使用继承了BaseEpmetEntity的实体。
|
5 years ago |
|
sunyuchao
|
abce867f0d
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
sunyuchao
|
fbf702839c
|
程序修改
|
5 years ago |
|
wxz
|
37d79c12c6
|
Merge branch 'dev_group_code' into dev_temp
|
5 years ago |
|
wxz
|
461e1dc7d2
|
小组二维码查询接口，url增加域名信息
|
5 years ago |
