yinzuomei
|
fb8176d9b2
|
Merge remote-tracking branch 'origin/dev_zhili'
|
3 years ago |
|
yinzuomei
|
a9ced40803
|
多元主体分析-地图坐标
|
3 years ago |
sunyuchao
|
54a919240d
|
Merge branch 'dev_bugfix_ljj'
|
3 years ago |
|
sunyuchao
|
0c89c9bc3b
|
..
|
3 years ago |
zhangyuan
|
058242d4d6
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud
|
3 years ago |
|
zhangyuan
|
e0cf147fce
|
Merge branch 'bugfix_statistical'
|
3 years ago |
|
zhangyuan
|
0f85367ff0
|
FIX
|
3 years ago |
|
sunyuchao
|
1774c80520
|
Merge branch 'dev_bugfix_ljj'
|
3 years ago |
|
sunyuchao
|
eea4122606
|
人房数据统计排除迁出和死亡人员数据
|
3 years ago |
|
zhangyuan
|
804ede2303
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud
|
3 years ago |
|
zhangyuan
|
f4420d4be4
|
修复
|
3 years ago |
|
sunyuchao
|
4073e3ccc1
|
Merge branch 'dev_bugfix_ljj'
|
3 years ago |
|
sunyuchao
|
a01f100063
|
bug修复
|
3 years ago |
wanggongfeng
|
e710197eeb
|
小区统计逻辑修改
|
3 years ago |
wangxianzhang
|
f13a370cc1
|
修复：【客户初始化】sort字段类型不匹配导致的反射复制对象得到字段值为null。
|
3 years ago |
jianjun
|
dcee2a4900
|
Merge remote-tracking branch 'remotes/origin/dev_0608fix'
|
3 years ago |
YUJT
|
a70864dadf
|
合并分支
|
3 years ago |
|
YUJT
|
29825586e6
|
append
|
3 years ago |
|
zhangyuan
|
69e181082e
|
Merge branch 'feature/statistical_zhy'
|
3 years ago |
|
zhangyuan
|
e15281378f
|
bug
|
3 years ago |
|
YUJT
|
305f1c8a1f
|
默认密码
|
3 years ago |
|
zhangyuan
|
e528c9b5ba
|
Merge branch 'feature/statistical_zhy'
|
3 years ago |
|
zhangyuan
|
d28cd38d6e
|
BUG
|
3 years ago |
zxc
|
d16de7541e
|
时间调整
|
3 years ago |
|
jianjun
|
6e5c2b5521
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
4cd7e07fff
|
去掉拦截器里面的 更新人和更新时间默认取创建里的值得逻辑
|
3 years ago |
|
zhangyuan
|
2997a4ae55
|
补充借口
|
3 years ago |
|
zhangyuan
|
7e8876b08e
|
冗余
|
3 years ago |
|
jianjun
|
4b173f4fb1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
36247a9363
|
更新时间设置为空 利用拦截器统一填充
|
3 years ago |
|
zhangyuan
|
d86036cb3b
|
小区统计
|
3 years ago |
|
zhangyuan
|
65e70b23e0
|
Merge branch 'feature/statistical_zhy'
|
3 years ago |
|
wanggongfeng
|
36177f2c11
|
人房信息统计补充字段
|
3 years ago |
|
jianjun
|
b7fd9ecb7d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
019aae0df6
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
|
3 years ago |
|
wangxianzhang
|
585eb3ee06
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
a3ac6358f2
|
修改：所有使用了rocketmq的服务，都加上rocketmq单独的日志appender。解决mq日志过大，容器占用磁盘的情况
|
3 years ago |
|
jianjun
|
d9c9b4d085
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
db2ea6e75c
|
避免空指针
|
3 years ago |
Jackwang
|
d95758e097
|
branchlist接口调整
|
3 years ago |
|
jianjun
|
6847bccdcd
|
居民导出 获取支部
|
3 years ago |
|
yinzuomei
|
580f883a8c
|
Merge remote-tracking branch 'origin/dev_zhili'
|
3 years ago |
|
yinzuomei
|
f9e1b30f56
|
服务过的需求列表
|
3 years ago |
|
zxc
|
a3fd5d51c2
|
building
|
3 years ago |
HAHA
|
cc2a4be89c
|
sql
|
3 years ago |
|
HAHA
|
9da96bc9ac
|
完善逻辑
|
3 years ago |
|
yinzuomei
|
4a9d85f6c6
|
冲突了
|
3 years ago |
|
yinzuomei
|
e2817da49e
|
Merge remote-tracking branch 'origin/dev_0608fix' into dev_0608fix
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
|
3 years ago |
|
yinzuomei
|
19f6e548ef
|
房屋列表：remark
|
3 years ago |
|
zxc
|
2e0263fa35
|
remark
|
3 years ago |
