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
|
454714c4c1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
fd6135acc1
|
代码微调
|
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
|
b5a53e8bdf
|
合并错误
|
4 years ago |
yinzuomei
|
51be467c63
|
Merge branch 'wxz_resiimport_temp' into dev
|
4 years ago |
|
yinzuomei
|
308c9715eb
|
init
|
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 |
|
jianjun
|
2b8a74b3c4
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
|
4 years ago |
|
jianjun
|
f8d9e871fb
|
grid缓存不对
|
4 years ago |
zxc
|
e7dbb236b8
|
注释更新户数
|
4 years ago |
|
jianjun
|
14fe68ac54
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
546cb7d6fe
|
grid缓存不对
|
4 years ago |
|
jianjun
|
77068a4714
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
4 years ago |
|
jianjun
|
020df4166f
|
去掉房屋必须填写的 房主信息
|
4 years ago |
wangxianzhang
|
019dd5b040
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
f94dfb5a82
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
e9a2517206
|
改错了啊啊啊
|
4 years ago |
|
wangxianzhang
|
297c200118
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
52a1a97356
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
9ab3f3396a
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
4 years ago |
|
wangxianzhang
|
6979f590e7
|
改错了啊啊啊
|
4 years ago |
|
jianjun
|
a3399d0cc0
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
4 years ago |
|
jianjun
|
e7971fbbbc
|
导出方法
|
4 years ago |
|
zxc
|
f5b145e0b5
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
a8a0154bd5
|
emm
|
4 years ago |
|
zxc
|
851524fc1b
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
bf55425e7a
|
Merge branch 'wxz_resiimport_temp' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
|
4 years ago |
|
zxc
|
ed2033d26d
|
房屋导入修改，存在的更新
|
4 years ago |
|
wangxianzhang
|
759ada7236
|
去掉compose文件中注释掉的image:内容
|
4 years ago |
|
jianjun
|
6778b9da7b
|
添加注释
|
4 years ago |
|
yinzuomei
|
1c75cc55ea
|
居民录入标签顺序调整为：身份证号、性别、出生日期。
|
4 years ago |
|
wangxianzhang
|
85ab5acd0a
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
bf58a70776
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
38c55669a2
|
房屋添加接口去掉房主必填版本冲突
|
4 years ago |
|
wangxianzhang
|
79b5552531
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
