jianjun
|
78ea9c50cf
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
wangxianzhang
|
d3e93bfce4
|
【政策找人】修复：年龄-不为空，报NumberFormatException
|
3 years ago |
|
wangxianzhang
|
615f8a8a6b
|
【政策找人】修复：年龄-不为空，报NumberFormatException
|
3 years ago |
|
jianjun
|
99b60c7455
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
76b03dee54
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform into 市北master
|
3 years ago |
|
jianjun
|
47255dfe88
|
Merge remote-tracking branch 'remotes/origin/dev_bug_select_staff' into 市北master
|
3 years ago |
zxc
|
d230318120
|
emm
|
3 years ago |
|
wangxianzhang
|
4275d40cbc
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
wangxianzhang
|
fa1a116aa4
|
【政策找人】查询列表动作，支持传入is_null/is_not_null
|
3 years ago |
yinzuomei
|
01e3dc01ab
|
colVal可空
|
3 years ago |
|
wangxianzhang
|
937edaf4f7
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
3 years ago |
|
yinzuomei
|
a9db5a1768
|
editStaffInit少的代码
|
3 years ago |
|
jianjun
|
2b0d73d0dc
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
3 years ago |
zhaoqifeng
|
e196e82e5d
|
检索条件精确到时分秒
|
3 years ago |
|
yinzuomei
|
bb04455f5a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
35dc6be063
|
网格员服务电话接口调整
|
3 years ago |
|
wangxianzhang
|
50ab9c9f74
|
【RocketMQ】通过启动类启用slf4j日志
|
3 years ago |
|
wangxianzhang
|
0fa7ea7088
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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 |
|
wangxianzhang
|
6220d4aec5
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
3497da5387
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform
|
3 years ago |
|
wangxianzhang
|
ea7123148f
|
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 |
|
jianjun
|
418e4a234c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
zxc
|
82b43d36f6
|
新角色编辑时加判断
|
3 years ago |
|
jianjun
|
9d689a7705
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis' into 市北master
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
|
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
|
eaa952b778
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
