zxc
|
dcbe869c63
|
emm
|
4 years ago |
sunyuchao
|
cf001aab6b
|
..
|
4 years ago |
|
sunyuchao
|
07c628b97f
|
核酸记录_新增
|
4 years ago |
|
sunyuchao
|
0b6eef93dc
|
核酸记录代码生成
|
4 years ago |
jianjun
|
d5ea391a19
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
ce0eb794e2
|
超时打印日志
|
4 years ago |
|
jianjun
|
d3de5f684c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
33661f258e
|
id 重复 试下
|
4 years ago |
|
jianjun
|
118c930d89
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
7e41369e96
|
消费巡查消息调整
|
4 years ago |
|
jianjun
|
a7f62d3962
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
454714c4c1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
fd6135acc1
|
代码微调
|
4 years ago |
|
jianjun
|
0e3e96f94f
|
导入小区时 更新楼宇的房间数 up
|
4 years ago |
|
jianjun
|
6b42b19b37
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
4 years ago |
|
jianjun
|
acba9572c8
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
|
4 years ago |
|
jianjun
|
e75b110ac7
|
导入小区时 更新楼宇的房间数 up
|
4 years ago |
|
jianjun
|
004ea9cd76
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
975def098f
|
Merge remote-tracking branch 'remotes/origin/develop' into 主线测试
|
4 years ago |
|
jianjun
|
e17287fda5
|
Merge remote-tracking branch 'remotes/origin/wxz_resiimport_temp' into develop
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java
|
4 years ago |
|
jianjun
|
3950bc94db
|
导入小区时 更新楼宇的房间数
|
4 years ago |
|
jianjun
|
0254aa56db
|
stats添加数据源index up
|
4 years ago |
|
jianjun
|
17f31d1abe
|
stats添加数据源index up
|
4 years ago |
|
jianjun
|
e273b0aeab
|
stats添加数据源index
|
4 years ago |
|
jianjun
|
8f7140a860
|
stats失败
|
4 years ago |
|
jianjun
|
abd6a84585
|
shibail
|
4 years ago |
|
jianjun
|
cd0d7a768e
|
合并错误u
|
4 years ago |
|
jianjun
|
428eadff16
|
合并错误u
|
4 years ago |
|
jianjun
|
8adf77447a
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
4 years ago |
|
jianjun
|
359eb92055
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
|
4 years ago |
|
jianjun
|
eb97051ebd
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
b5a53e8bdf
|
合并错误
|
4 years ago |
|
jianjun
|
1f1cfc17d3
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
|
4 years ago |
|
jianjun
|
23621c90ba
|
废弃网格+居民导入+房屋导入调整 up
|
4 years ago |
|
jianjun
|
ea048fef93
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
|
4 years ago |
yinzuomei
|
c1a89965d7
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
51be467c63
|
Merge branch 'wxz_resiimport_temp' into dev
|
4 years ago |
|
yinzuomei
|
308c9715eb
|
init
|
4 years ago |
|
jianjun
|
a0eb799770
|
废弃网格+居民导入+房屋导入调整 up
|
4 years ago |
|
jianjun
|
09544847c1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
|
4 years ago |
|
jianjun
|
670ebd4913
|
修改版本号
|
4 years ago |
|
jianjun
|
b13f910f7d
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
|
4 years ago |
|
jianjun
|
403777271d
|
Merge remote-tracking branch 'remotes/origin/dev_abandon_grid' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
|
4 years ago |
|
jianjun
|
583868b14d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into wxz_resiimport_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
|
4 years ago |
|
jianjun
|
b74a7d5ab1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
6d15b3278d
|
Merge remote-tracking branch 'remotes/origin/develop' into 主线测试
|
4 years ago |
|
jianjun
|
3e842fb465
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
|
4 years ago |
|
jianjun
|
ca40bfca12
|
grid缓存不对添加组织名称
|
4 years ago |
|
yinzuomei
|
ac471df96c
|
/resi/mine/personalcenter/initinfo返参mobile、realName
|
4 years ago |
|
jianjun
|
8172b75646
|
Merge remote-tracking branch 'remotes/origin/develop' into 主线测试
|
4 years ago |
