dai
|
4b535d98ed
|
2
|
3 years ago |
|
dai
|
23d5b21711
|
Merge branch 'dev-calendar' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-calendar
|
3 years ago |
|
dai
|
268ab56021
|
党建日历初始化
|
3 years ago |
jianjun
|
14838d329b
|
Merge branch 'dev_ljj_idcard' into dev
|
3 years ago |
|
jianjun
|
cb8e0e9889
|
疫情防控下的身份证号改 证件号
|
3 years ago |
|
jianjun
|
a3c82eaec4
|
Merge branch 'dev_ljj_idcard'
|
3 years ago |
|
jianjun
|
d8486b231c
|
改了几个 证件号
|
3 years ago |
|
jianjun
|
8b45b47cd8
|
Merge remote-tracking branch 'origin/dev_shehuizuzhi_ljj' into dev
|
3 years ago |
|
jianjun
|
c818dd6114
|
社会组织搜索框调整
|
3 years ago |
|
jianjun
|
93709941ab
|
Merge remote-tracking branch 'origin/dev_ljj_samll_adjust' into dev_ljj_idcard
|
3 years ago |
|
jianjun
|
a16fa095b1
|
Merge remote-tracking branch 'origin/dev_ljj_samll_adjust'
|
3 years ago |
|
jianjun
|
10c6828e70
|
社会组织bug
|
3 years ago |
zhangyuan
|
5a2cbdb81a
|
Merge branch 'bugfix_zhy123'
# Conflicts:
# src/views/modules/plugins/change/changedeath-add-or-update.vue
# src/views/modules/plugins/change/changedeath.vue
# src/views/modules/plugins/change/changerelocation.vue
# src/views/modules/plugins/change/changewelfare-add-or-update.vue
# src/views/modules/plugins/change/changewelfare.vue
|
3 years ago |
|
jianjun
|
b39bdb0bc1
|
Merge remote-tracking branch 'origin/dev_shehuizuzhi_ljj' into dev
|
3 years ago |
|
jianjun
|
e2f43eabaa
|
社会组织bug
|
3 years ago |
wangxianzhang
|
0fc44f686c
|
Merge branch 'dev_ljj_idcard'
|
3 years ago |
zxc
|
c7c12e834b
|
暂提
|
3 years ago |
|
jianjun
|
bcf6666b19
|
Merge branch 'dev_zxc_work_log' into dev
|
3 years ago |
|
jianjun
|
1dabe36d7b
|
工作日志分类
|
3 years ago |
|
jianjun
|
8dd284ae3d
|
Merge branch 'dev_shehuizuzhi_ljj' into dev
|
3 years ago |
|
jianjun
|
f6a8876796
|
社会组织再次调整
|
3 years ago |
jiangyy
|
1b3339f4d7
|
Merge branch 'dev-calendar' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-calendar
|
3 years ago |
|
jiangyy
|
1e6df2294d
|
111
|
3 years ago |
|
zxc
|
c3a4843001
|
worklog
|
3 years ago |
|
jianjun
|
790bdb9fb7
|
Merge branch 'dev_ljj_idcard' into dev
|
3 years ago |
|
jianjun
|
9810f58389
|
Merge branch 'dev_zxc_work_log' into dev
|
3 years ago |
|
jianjun
|
60fa7ac723
|
工作日志分类 添加功能
|
3 years ago |
|
zxc
|
fb980eef5f
|
worklog
|
3 years ago |
|
zhangyuan
|
38780c5d41
|
正则
|
3 years ago |
|
jianjun
|
b2bb80f0d0
|
Merge branch 'dev_shehuizuzhi_ljj' into dev
|
3 years ago |
|
jianjun
|
2369d22836
|
社会组织第二版
|
3 years ago |
zhaoqifeng
|
b9ca9aeea3
|
Merge branch 'dev-calendar' into dev
|
3 years ago |
|
zhaoqifeng
|
e14c3dd900
|
添加党组织修改
|
3 years ago |
|
zhangyuan
|
514b85a15a
|
央视调整
|
3 years ago |
|
zhangyuan
|
9cd83b196b
|
label宽度
|
3 years ago |
|
zhangyuan
|
a753465166
|
Merge branch 'dev' of http://121.42.41.42:7070/r/epmet-oper-gov into dev
|
3 years ago |
|
zhangyuan
|
1a669fdb61
|
Merge branch 'bugfix_zhy123' into dev
# Conflicts:
# src/views/modules/plugins/change/changedeath-add-or-update.vue
# src/views/modules/plugins/change/changedeath.vue
# src/views/modules/plugins/change/changerelocation.vue
# src/views/modules/plugins/change/changewelfare-add-or-update.vue
# src/views/modules/plugins/change/changewelfare.vue
|
3 years ago |
|
zhangyuan
|
8dedd73616
|
身份证号相关改为证件号
|
3 years ago |
|
zhaoqifeng
|
fb2efdd557
|
Merge branch 'dev-calendar' into dev
|
3 years ago |
|
zhaoqifeng
|
946c538fab
|
添加党组织修改
|
3 years ago |
|
jianjun
|
be334178fe
|
证件号bug修改
|
3 years ago |
|
dai
|
6538dcce88
|
党建日历
|
3 years ago |
|
jianjun
|
c7cd7ae039
|
Merge branch 'dev_shehuizuzhi_ljj' into dev
|
3 years ago |
|
jianjun
|
688287c54b
|
原来的社会组织添加 头像等调整 去掉积分
|
3 years ago |
|
jiangyy
|
8fd6ea164e
|
Merge branch 'yantai_master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into yantai_master
|
3 years ago |
|
jianjun
|
dc15ae0660
|
Merge branch 'dev_shehuizuzhi_ljj' into dev
|
3 years ago |
|
jiangyy
|
a485480ebb
|
公共服务去掉时间限制
|
3 years ago |
|
jiangyy
|
b1b8e52c68
|
11
|
3 years ago |
|
jianjun
|
2427257046
|
原来的社会组织添加 头像等调整
|
3 years ago |
|
jiangyy
|
e44d9fd94a
|
时间限制
|
3 years ago |
