wangxianzhang
|
9bbbe02c97
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
3 years ago |
|
wangxianzhang
|
599b378e79
|
给许多options接口加缓存，10s有效期，明天应该有起效。所以，有些东西，比如网格，小区，字典表，如果增加、删除、修改了数据，可能要过个几秒钟，接口中的新数据才会生效
|
3 years ago |
|
wangxianzhang
|
fbace57888
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
fd6827672d
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
0dc9874440
|
时间类型转换
|
3 years ago |
|
wangxianzhang
|
d182aa5f59
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
wangxianzhang
|
d7a67fbd22
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
yinzuomei
|
28ccffcabc
|
address
|
3 years ago |
|
wangxianzhang
|
8248f0ffb3
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
yinzuomei
|
88e941fdcf
|
未做核酸比对调整改为视图查询
|
3 years ago |
|
yinzuomei
|
a11c7f9207
|
gov/access/govrole/page分也不好使也没人发现哎
|
3 years ago |
zxc
|
84861a2d72
|
重点行程列表和饼图修改传参
|
3 years ago |
|
yinzuomei
|
0a8b3da1f9
|
/gov/org/agency/maporg错误提示出来
|
3 years ago |
|
yinzuomei
|
20a80f6fd5
|
没什么用
|
3 years ago |
|
yinzuomei
|
8f187adf0e
|
删除党员风采
|
3 years ago |
|
yinzuomei
|
bb51816f8e
|
注释
|
3 years ago |
|
wangxianzhang
|
bdfe019920
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls
|
3 years ago |
|
yinzuomei
|
18ab80e5f3
|
身份证号调大一点
|
3 years ago |
|
wangxianzhang
|
b809ff8d2f
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
|
3 years ago |
|
wangxianzhang
|
3c0f1b789b
|
-
|
3 years ago |
|
wangxianzhang
|
36330d0dcf
|
-
|
3 years ago |
|
wangxianzhang
|
610cea40fe
|
-
|
3 years ago |
|
wangxianzhang
|
b7bff4c801
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
e3c051dbe9
|
-
|
3 years ago |
|
wangxianzhang
|
6f797ca1d7
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
283b0b7045
|
-
|
3 years ago |
|
wangxianzhang
|
159ffb1b94
|
-
|
3 years ago |
|
wangxianzhang
|
7a00d9b038
|
增加同步任务sql
|
3 years ago |
|
wangxianzhang
|
300e9f2b55
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
cf75416107
|
核酸检测同步，增加异步处理任务
|
3 years ago |
|
yinzuomei
|
de445aa48c
|
调整下排序
|
3 years ago |
|
yinzuomei
|
d2b124d875
|
1
|
3 years ago |
|
yinzuomei
|
a093d3a0df
|
zaishishi
|
3 years ago |
|
yinzuomei
|
599109db1c
|
联建活动列表
|
3 years ago |
|
yinzuomei
|
667b8ab2e6
|
Merge remote-tracking branch 'origin/dev_tripreport'
|
3 years ago |
|
yinzuomei
|
d8eef30b3c
|
/heart/icpartyactivity/search联建活动列表
|
3 years ago |
sunyuchao
|
504395d8ea
|
Merge branch 'dev_house_export_syc'
|
3 years ago |
|
sunyuchao
|
3dbaa77146
|
模板删除九小场所
|
3 years ago |
|
wangxianzhang
|
f7403a7261
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
wangxianzhang
|
39409f1b8e
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
sunyuchao
|
35d30e646b
|
Merge branch 'dev_house_export_syc'
|
3 years ago |
|
sunyuchao
|
ae48094966
|
删除无用模板
|
3 years ago |
|
zxc
|
f7769f3307
|
同步
|
3 years ago |
|
sunyuchao
|
8d8ff32cdc
|
模板修改
|
3 years ago |
|
sunyuchao
|
d50b5663ef
|
Merge branch 'dev_house_export_syc'
|
3 years ago |
|
sunyuchao
|
892de51f78
|
代码还原
|
3 years ago |
|
sunyuchao
|
2d2c9a9b79
|
模板必填项标红
|
3 years ago |
|
sunyuchao
|
922abb6bd4
|
居民导入模板暂时还原
|
3 years ago |
|
zxc
|
ed0605fd66
|
emm
|
3 years ago |
|
zxc
|
89f45c19e6
|
暂提一波
|
3 years ago |
