yinzuomei
|
b3d8ae3b10
|
Merge remote-tracking branch 'origin/dev_ylfn'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
3 years ago |
|
yinzuomei
|
540204bdbc
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
zxc
|
aef7cfe939
|
新字段
|
3 years ago |
|
yinzuomei
|
396103b816
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
|
zxc
|
ebac3e2243
|
新字段
|
3 years ago |
zhaoqifeng
|
4b06c587f7
|
更新是否育龄妇女定时任务
|
3 years ago |
|
zhaoqifeng
|
06cc5e8ac4
|
更新是否育龄妇女定时任务
|
3 years ago |
|
yinzuomei
|
038b8c47ca
|
不等于空串
|
3 years ago |
|
zhaoqifeng
|
c14fd64161
|
更新是否育龄妇女定时任务
|
3 years ago |
|
yinzuomei
|
32547af4c7
|
Merge remote-tracking branch 'origin/dev_ic_user_houe_statis_syc'
|
3 years ago |
|
zhaoqifeng
|
71f57815e7
|
Merge branches 'dev_ylfn' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ylfn
|
3 years ago |
|
yinzuomei
|
d348a1c833
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yinzuomei
|
2e1af3c9f5
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
wangxianzhang
|
5bd15bb4bb
|
证件号工具类增加年龄计算
|
3 years ago |
|
wangxianzhang
|
ac37d2fb7d
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
yinzuomei
|
ecc2d44161
|
buig
|
3 years ago |
|
yinzuomei
|
bd5706aa6c
|
ic_resi_category_stats_config调整
|
3 years ago |
|
yinzuomei
|
6ab99298d7
|
居民类别配置调整
|
3 years ago |
|
zxc
|
eadc1c9bff
|
新字段
|
3 years ago |
|
yinzuomei
|
048845be8b
|
Merge remote-tracking branch 'origin/dev_party_helper'
|
3 years ago |
|
yinzuomei
|
2e260ff834
|
gov_party_helper
|
3 years ago |
sunyuchao
|
304fd62c86
|
人防概览下钻接口bug修改
|
3 years ago |
|
zxc
|
ce60644b40
|
新字段
|
3 years ago |
|
zxc
|
faa1a9ed50
|
新字段
|
3 years ago |
|
sunyuchao
|
aee8ef2e4e
|
人防概览下钻接口
|
3 years ago |
|
yinzuomei
|
e9a0ead83a
|
根据编码长度判断grid_level注释
|
3 years ago |
|
sunyuchao
|
da12d790fd
|
接口增加返参
|
3 years ago |
|
zhaoqifeng
|
8de366c903
|
企事业单位复查消息提醒
|
3 years ago |
|
wangxianzhang
|
a4c6295a8d
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
zxc
|
2cf9e573ab
|
emm
|
3 years ago |
|
zxc
|
8972a3249d
|
emm
|
3 years ago |
|
sunyuchao
|
9d2f015082
|
Merge branch 'dev_party_helper'
|
3 years ago |
|
sunyuchao
|
d9f4d44b5c
|
脚本
|
3 years ago |
|
sunyuchao
|
d66e4577a4
|
Merge branch 'dev_party_helper'
|
3 years ago |
|
sunyuchao
|
1ce47f3fd2
|
你好
|
3 years ago |
|
zhaoqifeng
|
b9790deea7
|
小组详情
|
3 years ago |
|
zhaoqifeng
|
a1203949c4
|
小组详情
|
3 years ago |
|
zhaoqifeng
|
28d8802a65
|
Merge branch 'dev_party_auth_up_syc'
|
3 years ago |
|
zhaoqifeng
|
c32f7e303b
|
同一小区下楼栋不重名
|
3 years ago |
|
wangxianzhang
|
86e77e1aa5
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
yinzuomei
|
2d6da82f75
|
Merge remote-tracking branch 'origin/dev_party_auth_up_syc'
|
3 years ago |
|
yinzuomei
|
a03263b4da
|
Merge remote-tracking branch 'origin/dev_party_helper'
|
3 years ago |
|
yinzuomei
|
494de9abed
|
更新时间
|
3 years ago |
|
sunyuchao
|
8e3a6e244c
|
Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
|
3 years ago |
|
sunyuchao
|
ac1f033ce4
|
bug修改
|
3 years ago |
|
yinzuomei
|
a54f324876
|
Merge remote-tracking branch 'origin/dev_party_helper'
|
3 years ago |
|
yinzuomei
|
8fa9cc51eb
|
日期错了
|
3 years ago |
|
yinzuomei
|
a3a603c655
|
Merge remote-tracking branch 'origin/dev_party_helper'
|
3 years ago |
|
yinzuomei
|
b8029836c8
|
活动主题
|
3 years ago |
|
sunyuchao
|
f87e18a900
|
日程推消息 消息内容调整
|
3 years ago |
