yinzuomei
|
b72ecc6687
|
测试要测试
|
4 years ago |
wangxianzhang
|
5639b476bc
|
版本升级
|
4 years ago |
|
wangxianzhang
|
8e94a181b4
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
jianjun
|
d32d5fedb1
|
Merge remote-tracking branch 'remotes/origin/dev' into 主线测试
|
4 years ago |
|
jianjun
|
8a4ff01de1
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
4 years ago |
|
wangxianzhang
|
1c5ab34b4d
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
1bd8b75e8c
|
bug
|
4 years ago |
|
wangxianzhang
|
4178c25598
|
-
|
4 years ago |
|
jianjun
|
8804f54c37
|
疫情防控
|
4 years ago |
|
jianjun
|
4994bd4c7d
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
# Conflicts:
# epmet-admin/epmet-admin-server/pom.xml
# epmet-auth/pom.xml
# epmet-gateway/pom.xml
# epmet-module/data-aggregator/data-aggregator-server/pom.xml
# epmet-module/data-report/data-report-server/pom.xml
# epmet-module/data-statistical/data-statistical-server/pom.xml
# epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
# epmet-module/epmet-common-service/common-service-server/pom.xml
# epmet-module/epmet-demo/epmet-demo-server/pom.xml
# epmet-module/epmet-ext/epmet-ext-server/pom.xml
# epmet-module/epmet-heart/epmet-heart-server/pom.xml
# epmet-module/epmet-job/epmet-job-server/pom.xml
# epmet-module/epmet-message/epmet-message-server/pom.xml
# epmet-module/epmet-oss/epmet-oss-server/pom.xml
# epmet-module/epmet-point/epmet-point-server/pom.xml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/gov-access/gov-access-server/pom.xml
# epmet-module/gov-grid/gov-grid-server/pom.xml
# epmet-module/gov-issue/gov-issue-server/pom.xml
# epmet-module/gov-mine/gov-mine-server/pom.xml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/gov-project/gov-project-server/pom.xml
# epmet-module/gov-voice/gov-voice-server/pom.xml
# epmet-module/open-data-worker/open-data-worker-server/pom.xml
# epmet-module/oper-access/oper-access-server/pom.xml
# epmet-module/oper-crm/oper-crm-server/pom.xml
# epmet-module/oper-customize/oper-customize-server/pom.xml
# epmet-module/resi-group/resi-group-server/pom.xml
# epmet-module/resi-guide/resi-guide-server/pom.xml
# epmet-module/resi-hall/resi-hall-server/pom.xml
# epmet-module/resi-home/resi-home-server/pom.xml
# epmet-module/resi-mine/resi-mine-server/pom.xml
# epmet-module/resi-partymember/resi-partymember-server/pom.xml
# epmet-module/resi-voice/resi-voice-server/pom.xml
# epmet-openapi/epmet-openapi-scan/pom.xml
# epmet-user/epmet-user-server/pom.xml
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
|
jianjun
|
de04f29ed1
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
# Conflicts:
# epmet-admin/epmet-admin-server/pom.xml
# epmet-auth/pom.xml
# epmet-gateway/pom.xml
# epmet-module/data-aggregator/data-aggregator-server/pom.xml
# epmet-module/data-report/data-report-server/pom.xml
# epmet-module/data-statistical/data-statistical-server/pom.xml
# epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
# epmet-module/epmet-common-service/common-service-server/pom.xml
# epmet-module/epmet-demo/epmet-demo-server/pom.xml
# epmet-module/epmet-ext/epmet-ext-server/pom.xml
# epmet-module/epmet-heart/epmet-heart-server/pom.xml
# epmet-module/epmet-job/epmet-job-server/pom.xml
# epmet-module/epmet-message/epmet-message-server/pom.xml
# epmet-module/epmet-oss/epmet-oss-server/pom.xml
# epmet-module/epmet-point/epmet-point-server/pom.xml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/gov-access/gov-access-server/pom.xml
# epmet-module/gov-grid/gov-grid-server/pom.xml
# epmet-module/gov-issue/gov-issue-server/pom.xml
# epmet-module/gov-mine/gov-mine-server/pom.xml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/gov-project/gov-project-server/pom.xml
# epmet-module/gov-voice/gov-voice-server/pom.xml
# epmet-module/open-data-worker/open-data-worker-server/pom.xml
# epmet-module/oper-access/oper-access-server/pom.xml
# epmet-module/oper-crm/oper-crm-server/pom.xml
# epmet-module/oper-customize/oper-customize-server/pom.xml
# epmet-module/resi-group/resi-group-server/pom.xml
# epmet-module/resi-guide/resi-guide-server/pom.xml
# epmet-module/resi-hall/resi-hall-server/pom.xml
# epmet-module/resi-home/resi-home-server/pom.xml
# epmet-module/resi-mine/resi-mine-server/pom.xml
# epmet-module/resi-partymember/resi-partymember-server/pom.xml
# epmet-module/resi-voice/resi-voice-server/pom.xml
# epmet-openapi/epmet-openapi-scan/pom.xml
# epmet-user/epmet-user-server/pom.xml
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
zxc
|
a368be32db
|
版本号更改
|
4 years ago |
|
jianjun
|
adf2ad4f60
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
4317a567e8
|
Merge remote-tracking branch 'remotes/origin/develop' into 主线测试
|
4 years ago |
|
jianjun
|
4b0bbcc225
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
eb494e3c03
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
|
jianjun
|
bfef176b33
|
监听居民信息变动 如果是删除或者新增 则更新是否居民状态
|
4 years ago |
|
zxc
|
5945a94b1d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
047a0a6138
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
e901f70541
|
emm bug
|
4 years ago |
|
zxc
|
116c5bc31c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
wangxianzhang
|
b5245a3e37
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
f4099e2197
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
9c3969b85e
|
修复：-
|
4 years ago |
zhaoqifeng
|
562cd7023b
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
4e125c0626
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
wangxianzhang
|
b912971200
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
dad3dc59aa
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
4 years ago |
|
wangxianzhang
|
bf7e7f4109
|
修复：-
|
4 years ago |
|
zhaoqifeng
|
29011bf20b
|
居民检索序号
|
4 years ago |
|
wangxianzhang
|
6019223cbc
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
143f6d4e9e
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
83e083d07c
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
4 years ago |
|
wangxianzhang
|
25035f51bc
|
修复：-
|
4 years ago |
|
yinzuomei
|
42fa7cdf95
|
Merge branches 'dev' and 'dev_epidemic_situation' of http://121.42.41.42:7070/r/epmet-cloud into dev_epidemic_situation
|
4 years ago |
|
wangxianzhang
|
0fe66ea4f4
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
22433869f1
|
Merge branches 'develop' and 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
abeff79831
|
修复：-
|
4 years ago |
|
wangxianzhang
|
f40a26b057
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
5bbf5af198
|
修复：-
|
4 years ago |
sunyuchao
|
9549879d0a
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
485c0afa7d
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
sunyuchao
|
afe68a52d7
|
列表增加排序、表增加查询用索引
|
4 years ago |
|
wangxianzhang
|
bb67f65df9
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
aa75b80cd4
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
a5eec335b6
|
修复：1.核酸检测结果填入核酸检测地址导致sql报错的bug。
|
4 years ago |
|
yinzuomei
|
becaa8b550
|
gov-org up
|
4 years ago |
|
yinzuomei
|
ccd14d5c2a
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
a93f0a9034
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
f28abd3c0d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
