jianjun
|
af9ac345a2
|
Merge remote-tracking branch 'remotes/origin/master' into 市北master
# Conflicts:
# epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls
|
3 years ago |
zhangyuan
|
98ce86d581
|
Merge branch 'feature/worklog_zhy'
|
3 years ago |
yinzuomei
|
5ecb98c607
|
Merge remote-tracking branch 'origin/dev_xjc_resi'
|
3 years ago |
wangxianzhang
|
25a5fc3a7f
|
aggregator的partymember的数据源调整
|
3 years ago |
|
yinzuomei
|
f2a6e4c923
|
daxie
|
3 years ago |
|
wangxianzhang
|
1bb1734c95
|
Merge branch 'dev_now_stats_syc' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
366c3d994c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform
|
3 years ago |
|
yinzuomei
|
3e73eda5b8
|
指挥调度人数
|
3 years ago |
|
jianjun
|
ca657ca352
|
Merge remote-tracking branch 'remotes/origin/dev_now_stats_syc'
|
3 years ago |
|
wangxianzhang
|
6b3a0ef72b
|
新增：居民信息导入，增加：新阶层人士
|
3 years ago |
|
yinzuomei
|
9dd3976090
|
ic_resi_user新增is_xjc;修改居民类别查询方法
|
3 years ago |
|
zhangyuan
|
a196cc4ac2
|
bug
|
3 years ago |
|
zhangyuan
|
2b4c6c0f3e
|
调整
|
3 years ago |
|
zhangyuan
|
e464525b5f
|
kehudi
|
3 years ago |
syc
|
b55f97f7cc
|
查询组织、网格改为查询实时数据，不在查询统计数据
|
3 years ago |
wanggongfeng
|
cafdb78cb1
|
Merge branch 'feature/dev_information_register'
|
3 years ago |
|
wanggongfeng
|
acfccc53f4
|
信息采集导出 列名改为单位名称
|
3 years ago |
Jackwang
|
8fc4bdc4ab
|
Merge remote-tracking branch 'origin/feature/dev_information_register'
|
3 years ago |
|
wanggongfeng
|
167c020745
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
|
3 years ago |
|
wanggongfeng
|
0e3fb2f5f6
|
信息采集审核 居民户籍地添加
|
3 years ago |
zxc
|
edb67bd3bd
|
去重
|
3 years ago |
|
syc
|
86aea9aac3
|
项目流转(回复退回吹哨结案)时公开答复为必填项
|
3 years ago |
|
syc
|
98a0e4bc85
|
表中加字段设计旧程序赋值问题
|
3 years ago |
|
Jackwang
|
21ccdc14bc
|
同一房间号两次提交调整为两条申请单
|
3 years ago |
|
syc
|
f7772549f5
|
数据实时统计列表查询、导出初版
|
3 years ago |
|
zhangyuan
|
191dfd3aa1
|
wanshansql
|
3 years ago |
|
jianjun
|
cb2b4882d5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
906538604d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
2ab866188c
|
项目进展 同步显示
|
3 years ago |
|
zhangyuan
|
fb7e4c89a5
|
排序
|
3 years ago |
|
zhangyuan
|
083c9756d0
|
补充
|
3 years ago |
|
wanggongfeng
|
1876b32d50
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
|
3 years ago |
|
wanggongfeng
|
08cc15cb1a
|
信息采集审核按钮添加权限
|
3 years ago |
|
Jackwang
|
4b1db66e5f
|
collect sql完善
|
3 years ago |
|
Jackwang
|
9a243aae5e
|
更新成员客户id
|
3 years ago |
HAHA
|
941f135d7a
|
Merge branch 'Optimize_code_dev_1'
|
3 years ago |
|
HAHA
|
176d2edecf
|
开发环境排错
|
3 years ago |
|
HAHA
|
c36e804e21
|
开发环境排错
|
3 years ago |
|
Jackwang
|
6ee6811f7b
|
二维码设置初始版本
|
3 years ago |
|
HAHA
|
b1d39977dd
|
开发环境排错
|
3 years ago |
|
HAHA
|
d92daf531d
|
开发环境排错
|
3 years ago |
|
syc
|
8b482e436b
|
表增加字段
|
3 years ago |
|
Jackwang
|
b8a1fce5f5
|
小区码、社区码添加社区名称
|
3 years ago |
|
zhangyuan
|
ee8c9e2fc0
|
flayway
|
3 years ago |
|
zhangyuan
|
65fb771d8b
|
调整
|
3 years ago |
|
zhangyuan
|
9447f08b10
|
完善
|
3 years ago |
|
HAHA
|
4336747fb6
|
修改返回字段名
|
3 years ago |
|
HAHA
|
0404255b42
|
获取详情时同时获取网格排序字段
|
3 years ago |
|
wanggongfeng
|
2547be29f8
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
|
3 years ago |
|
wanggongfeng
|
22c3c91036
|
信息采集审核bug
|
3 years ago |
