sunyuchao
|
9af8088e41
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
fada3d2dc8
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
a63a048cea
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
sunyuchao
|
4aee21a14c
|
初始新增变更记录数据时18类都为否的也要有变更记录数据只是没有明细数据
|
4 years ago |
wangxianzhang
|
e516b3e6b9
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
0d5f36f4b7
|
修复：
1.flyway脚本的字段长度问题fix
|
4 years ago |
zxc
|
dda580447d
|
sql长度
|
4 years ago |
yinzuomei
|
0029f59f1f
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
49240eec47
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
2b23adaf38
|
社会组织、社区自组织、区域化党建单位未解决的不给分
|
4 years ago |
|
wangxianzhang
|
5bd9ea94d2
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
3998294414
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
5c2558f4d7
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
1363855c5b
|
修复：
1.居民信息导入的bug
|
4 years ago |
|
zxc
|
f7c19675d8
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
5e1c95a0eb
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
9bbe2a350e
|
bug
|
4 years ago |
|
sunyuchao
|
209a722984
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
277e26d524
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
0072644c84
|
数据删除 分批处理
|
4 years ago |
|
sunyuchao
|
eea9208cd5
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
6dd2abe727
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
61331fe011
|
bug修改
|
4 years ago |
|
zxc
|
980d37a7eb
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
3c872cbb37
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
c0a8544306
|
bug
|
4 years ago |
|
sunyuchao
|
446bdd92f2
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
92c65d9be4
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
56e0b68937
|
bug修改
|
4 years ago |
|
yinzuomei
|
5bb47453ac
|
人员类别分析统计库，脚本
|
4 years ago |
|
yinzuomei
|
b5c23613a3
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
4e3cbb58f2
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
71bfa90582
|
需求指派社会组织下拉框改为与社会组织列表一致：展示当前工作人员所属组织建立的
|
4 years ago |
|
zxc
|
45c8b46b68
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
af9522187a
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
d00fe79c45
|
旧接口添加新的筛选条件
|
4 years ago |
|
yinzuomei
|
6f5069a2d8
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
8babf3cdc5
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
4623a8fe8e
|
/heart/serviceitem/dict-list增加入参type
|
4 years ago |
|
wangxianzhang
|
b0b660b20c
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
c2eba4b183
|
Merge branch 'dev' into dev_ic_diaodong
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
fd4cccef30
|
修复：
1.居民信息导入，排除不必要的列的校验
|
4 years ago |
|
wangxianzhang
|
76ddad1ef1
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
caf71e1e3b
|
修复：
1.调动居民的时候，只增加了调动记录，没增加类别变更记录的bug
|
4 years ago |
|
yinzuomei
|
1ed094879b
|
Merge remote-tracking branch 'origin/dev_optimize_for_ic' into develop
|
4 years ago |
|
yinzuomei
|
1add5cff17
|
/gov/org/building/treelist返参增加showName
|
4 years ago |
|
yinzuomei
|
094f8a2b43
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
ce8c1e8c7f
|
Merge remote-tracking branch 'origin/dev_optimize_for_ic' into develop
|
4 years ago |
|
wangxianzhang
|
c561d7474a
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
cf5f86dd79
|
修复：
代码错误，编译不通过
|
4 years ago |
