jianjun
|
311acefdeb
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
b5b8728333
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
zxc
|
f8a1d8f219
|
del
|
4 years ago |
|
zxc
|
3eab228fd6
|
del
|
4 years ago |
|
zxc
|
e92ed449e5
|
errorcode
|
4 years ago |
yinzuomei
|
89d0d24f05
|
改个地址
|
4 years ago |
zhaoqifeng
|
1f91bca284
|
data-aggregator升级
|
4 years ago |
|
zhaoqifeng
|
8fd25c08a5
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
de2f4f0c67
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
8fd121d734
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
e777635ea7
|
需求人列表
|
4 years ago |
|
zxc
|
51876107d4
|
edit
|
4 years ago |
|
zhaoqifeng
|
fdd7b17952
|
Merge branch 'dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
zhaoqifeng
|
d0ef6d9a65
|
下级组织的治理指数修改
|
4 years ago |
|
yinzuomei
|
3bf202d4b1
|
Merge branches 'dev_ic_platform' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_v2
|
4 years ago |
|
zxc
|
7e50856ea7
|
党群服务新增
|
4 years ago |
|
yinzuomei
|
76754262f6
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
1759dbb674
|
指派服务列表
|
4 years ago |
|
zxc
|
eede974beb
|
errorCode添加
|
4 years ago |
|
zxc
|
19a32e59e5
|
备注一下子
|
4 years ago |
lzh
|
a0caaa96e1
|
更新时去掉设置customerId
|
4 years ago |
|
lzh
|
08e84a5b4f
|
配置类别列表过滤
|
4 years ago |
|
jianjun
|
983f86406c
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
cc09d45fe5
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
848dd1be5c
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
f96d48a3bf
|
分类预警配置 错误信息修改
|
4 years ago |
|
zhaoqifeng
|
01d096f5d0
|
联建单位和活动相关接口
|
4 years ago |
|
yinzuomei
|
2c0cde139a
|
社区自组织列表
|
4 years ago |
|
jianjun
|
e68ca8a448
|
改了个名
|
4 years ago |
|
yinzuomei
|
831b4e78de
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
|
4 years ago |
|
yinzuomei
|
821383e3f6
|
社区自组织列表
|
4 years ago |
|
zxc
|
2acf90aade
|
emm
|
4 years ago |
sunyuchao
|
347a74bffa
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
sunyuchao
|
ef7d22175d
|
统一修改表名
|
4 years ago |
|
jianjun
|
dec8498fe0
|
代码调整
|
4 years ago |
|
yinzuomei
|
a3d7835d1f
|
社会组织列表
|
4 years ago |
|
jianjun
|
81a8faaaf3
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
ee37a94113
|
代码调整
|
4 years ago |
|
zxc
|
ea91adbc2a
|
emm˚
|
4 years ago |
|
zxc
|
4bc3e61cd7
|
查询
|
4 years ago |
|
sunyuchao
|
e41feb3669
|
九小场所下分队管理CRUD
|
4 years ago |
|
zhaoqifeng
|
d387cdf4be
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
3e73458b7d
|
房屋查询党员放在最前面
|
4 years ago |
|
zhaoqifeng
|
b0025889d2
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
ef755fd152
|
房屋查询党员放在最前面
|
4 years ago |
|
zhaoqifeng
|
eb47aaf630
|
联建单位和活动文件生成
|
4 years ago |
|
yinzuomei
|
03f12c31d6
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
93d1e3d8db
|
志愿者列表
|
4 years ago |
|
zhaoqifeng
|
ef81e99389
|
党员风采相关接口
|
4 years ago |
|
yinzuomei
|
82c602e196
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
