zhaoqifeng
|
1ff426d49c
|
project_process添加STAFF_NAME字段
|
3 years ago |
wangxianzhang
|
86c31a0c57
|
【rocketmq日志】之前修改mq日志的时候，忘了加上yml的配置，补充一下
|
3 years ago |
|
wangxianzhang
|
ee97f99db2
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
zhaoqifeng
|
4fdfbff531
|
Merge branch 'dev_project_statis'
|
3 years ago |
|
wangxianzhang
|
ba63cad4ba
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
jianjun
|
d5937779fa
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
d3c26eb07f
|
微信错误消息返回
|
3 years ago |
|
zhaoqifeng
|
a62e367693
|
项目实时统计
|
3 years ago |
|
jianjun
|
46c2917836
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
83785a1825
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
a8097c9569
|
总计 人均
|
3 years ago |
|
wangxianzhang
|
c9455b80e2
|
【居民信息导入】修复：根据身份证号判断是否为老年人，加入了变更记录中(之前漏掉这种情况了)
|
3 years ago |
|
wangxianzhang
|
f633e79f7f
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
zxc
|
82b43d36f6
|
新角色编辑时加判断
|
3 years ago |
|
jianjun
|
ab7ce7d2f0
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
c0ffb08f68
|
返回组织类型
|
3 years ago |
|
jianjun
|
a180c0c3e8
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
8171753a5c
|
网格员项目统计排序
|
3 years ago |
|
jianjun
|
f5c5c68728
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
70f2785143
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
ceaec34b3a
|
组织项目统计,网格员项目统计
|
3 years ago |
|
jianjun
|
3720807754
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
c632e652b5
|
组织项目统计,网格员项目统计
|
3 years ago |
|
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 |
