yinzuomei
|
7ba4e771a8
|
Merge remote-tracking branch 'origin/dev_guidance' into dev_guidance
|
4 years ago |
yinzuomei
|
e59701c4de
|
web分类列表查询不分页,分类下拉框通用接口
|
4 years ago |
zxc
|
a58a1df747
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
zxc
|
de42e5226a
|
paixushijian
|
4 years ago |
zxc
|
5f75b49e84
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
zxc
|
d919a1c09a
|
我的小组添加筛选条件
|
4 years ago |
sunyuchao
|
b9ba9f9ac8
|
Merge branch 'dev_group_msg' into develop
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
|
4 years ago |
sunyuchao
|
76cc97293f
|
接口加返参、人员列表顺序调整
|
4 years ago |
wxz
|
9a66324acf
|
【新增】1.完成小组总排名接口
|
4 years ago |
zhaoqifeng
|
4eb9520ec7
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
zhaoqifeng
|
5716a47e0a
|
办事指南增删改查
|
4 years ago |
yinzuomei
|
7ff134f3a4
|
guide_category_default相关生成的代码,删除
|
4 years ago |
wxz
|
41f73d4253
|
【新增】1.完成网格内小组排名接口
|
4 years ago |
zxc
|
3d5e6cf1f5
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
zxc
|
989f6194e4
|
默认值
|
4 years ago |
zxc
|
b5fcc12655
|
排序
|
4 years ago |
zxc
|
fe3b7e02f4
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
zxc
|
bc1c0b292e
|
排序修改
|
4 years ago |
sunyuchao
|
ba82ead4be
|
Merge branch 'dev_group_msg' into develop
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
|
4 years ago |
sunyuchao
|
7ab738da40
|
漏提代码
|
4 years ago |
sunyuchao
|
50985c9532
|
程序调整优化
|
4 years ago |
zxc
|
1b9a3d6997
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
jianjun
|
a6360f556e
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
jianjun
|
f5d1c068e0
|
Merge remote-tracking branch 'remotes/origin/dev_statistical_optimize' into dev
|
4 years ago |
zxc
|
ccfbbbe015
|
全部党员
|
4 years ago |
zxc
|
cbde6493a7
|
全部党员
|
4 years ago |
zhaoqifeng
|
f86ea8eae0
|
办事指南
|
4 years ago |
sunyuchao
|
05f3762f41
|
8、活动/通知/话题评论允许有图片
|
4 years ago |
yinzuomei
|
4aaeaf7260
|
gov-grid 48
|
4 years ago |
yinzuomei
|
efb4888fcc
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
zxc
|
4ae2da12e2
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
zxc
|
da4abdd281
|
查询客户下党员
|
4 years ago |
zxc
|
dbe78557be
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
zxc
|
29256d2d77
|
群组介绍
|
4 years ago |
zxc
|
55916816f7
|
组织生活
|
4 years ago |
yinzuomei
|
55d2200dd3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
yinzuomei
|
1298b0acd7
|
去除多余的error信息
|
4 years ago |
sunyuchao
|
4e4ddadd94
|
五种入组方式均需要推送站内信、微信消息
|
4 years ago |
zxc
|
cefde3dde1
|
report升级
|
4 years ago |
zxc
|
37130c776e
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
zxc
|
2ec305e6fe
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
zxc
|
5ac1a9c3d6
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
zxc
|
906dd81205
|
添加新字段
|
4 years ago |
yinzuomei
|
9677aba586
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
wxz
|
dec52fd7e2
|
版本升级
|
4 years ago |
yinzuomei
|
aa54bf2c73
|
组织生活发布:resi-group
|
4 years ago |
yinzuomei
|
e1dd0abcf0
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
yinzuomei
|
30c306ba71
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev
|
4 years ago |
wxz
|
a8936cde2f
|
Merge branch 'wxz_fix_job_repeat' into develop
|
4 years ago |
sunyuchao
|
879d23adfa
|
Merge branch 'dev_staff_info' into develop
|
4 years ago |