jianjun
|
1f9c7e4ebc
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
3 years ago |
zhaoqifeng
|
e6eabdde06
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
ab6072c1ce
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
9243f4e334
|
组织项目统计,网格员项目统计
|
3 years ago |
wangxianzhang
|
0306070a5f
|
Merge branches 'dev_policy_service' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
8d27413c88
|
【政策找人】修复年龄->出生日期重复转换问题
|
3 years ago |
|
wangxianzhang
|
aa55712fcf
|
Merge branch 'dev_policy_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
62170e8313
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
e59f5b5d93
|
Merge remote-tracking branch 'origin/dev_policy_service' into dev_policy_service
|
3 years ago |
|
wangxianzhang
|
0dc78a13dc
|
【政策找人】修复年龄->出生日期转换问题
|
3 years ago |
|
jianjun
|
0596ebb777
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_partymemberimport'
|
3 years ago |
|
zhaoqifeng
|
d0e24d6670
|
党员导入可覆盖原有信息
|
3 years ago |
yinzuomei
|
5b1ddcd8fb
|
Merge remote-tracking branch 'origin/dev_policy_service'
|
3 years ago |
|
yinzuomei
|
dcf0103853
|
恢复年龄组件
|
3 years ago |
|
zhaoqifeng
|
88420ebd93
|
组织项目统计
|
3 years ago |
|
jianjun
|
196eb9f197
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service'
|
3 years ago |
|
wangxianzhang
|
41c95f9823
|
【政策】修复
|
3 years ago |
|
yinzuomei
|
eea11e5da9
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
422a130faa
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
yinzuomei
|
c856d4647b
|
个人档案上报事件接口调整
|
3 years ago |
|
jianjun
|
c26e248a97
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service'
|
3 years ago |
|
jianjun
|
8de692dfae
|
Merge remote-tracking branch 'remotes/origin/dev_fangzhu'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
|
3 years ago |
|
wangxianzhang
|
7b159e8d6b
|
【政策】修复
|
3 years ago |
|
wangxianzhang
|
09b3ee4ca0
|
【政策】修复
|
3 years ago |
|
wangxianzhang
|
c7d77cffcf
|
【政策】修复分页varchar类型的birthday接收问题
|
3 years ago |
|
wangxianzhang
|
05b6a6b611
|
【政策】修复分页varchar类型的birthday接收问题
|
3 years ago |
|
zhaoqifeng
|
497291bacd
|
房主相关修改
|
3 years ago |
|
wangxianzhang
|
c0176da35c
|
【政策】修复分页问题
|
3 years ago |
|
wangxianzhang
|
f03ba75eb2
|
Merge branch 'dev_policy_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_policy_service
|
3 years ago |
|
jianjun
|
e4e749eccb
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
2a1bc01040
|
居民导出优化
|
3 years ago |
|
yinzuomei
|
fa150c76dc
|
weiyi
|
3 years ago |
zxc
|
57eaea7688
|
新增serviceCategoryKey字段，发起服务接口修改，查询列表修改
|
3 years ago |
|
zxc
|
6f6bb9513a
|
log级别修改
|
3 years ago |
|
zxc
|
2dc4b826a9
|
锁获取修改
|
3 years ago |
|
zhaoqifeng
|
a3b88d9d77
|
房主相关修改
|
3 years ago |
|
zxc
|
1f227799c3
|
刷新component_access_token加锁
|
3 years ago |
|
zxc
|
0f4c7b659f
|
刷新小程序token加锁
|
3 years ago |
|
wangxianzhang
|
60809285ef
|
Merge branch 'dev_policy_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_policy_service
|
3 years ago |
|
wangxianzhang
|
a640cd0c3b
|
【政策】完成导出
|
3 years ago |
|
yinzuomei
|
1d29464b96
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
4ba963ea5f
|
内部备注可空
|
3 years ago |
|
yinzuomei
|
773bd48cc1
|
Merge remote-tracking branch 'origin/dev_new_menu'
# Conflicts:
# 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
|
3 years ago |
|
jianjun
|
495c698ba5
|
项目分类错误
|
3 years ago |
|
yinzuomei
|
77d203048c
|
内容可以为空
|
3 years ago |
|
yinzuomei
|
f138207a7a
|
bugfix
|
3 years ago |
|
jianjun
|
755372c4f5
|
Merge remote-tracking branch 'remotes/origin/bugfix/teamB_shuangshi'
|
3 years ago |
|
zhaoqifeng
|
917e980a4d
|
房主相关修改
|
3 years ago |
|
zhaoqifeng
|
ec064f9631
|
双实居民录入pidsbug修改
|
3 years ago |
|
yinzuomei
|
3954edae0b
|
ic_policy_item数据
|
3 years ago |
