YUJT
|
a70864dadf
|
合并分支
|
4 years ago |
|
YUJT
|
29825586e6
|
append
|
4 years ago |
zhangyuan
|
69e181082e
|
Merge branch 'feature/statistical_zhy'
|
4 years ago |
|
zhangyuan
|
e15281378f
|
bug
|
4 years ago |
|
YUJT
|
305f1c8a1f
|
默认密码
|
4 years ago |
|
zhangyuan
|
e528c9b5ba
|
Merge branch 'feature/statistical_zhy'
|
4 years ago |
|
zhangyuan
|
d28cd38d6e
|
BUG
|
4 years ago |
jianjun
|
6e5c2b5521
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
4 years ago |
|
jianjun
|
4cd7e07fff
|
去掉拦截器里面的 更新人和更新时间默认取创建里的值得逻辑
|
4 years ago |
|
zhangyuan
|
2997a4ae55
|
补充借口
|
4 years ago |
|
zhangyuan
|
7e8876b08e
|
冗余
|
4 years ago |
|
jianjun
|
4b173f4fb1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
4 years ago |
|
jianjun
|
36247a9363
|
更新时间设置为空 利用拦截器统一填充
|
4 years ago |
|
zhangyuan
|
d86036cb3b
|
小区统计
|
4 years ago |
|
zhangyuan
|
65e70b23e0
|
Merge branch 'feature/statistical_zhy'
|
4 years ago |
wanggongfeng
|
36177f2c11
|
人房信息统计补充字段
|
4 years ago |
|
jianjun
|
b7fd9ecb7d
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
019aae0df6
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
|
4 years ago |
wangxianzhang
|
585eb3ee06
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
a3ac6358f2
|
修改：所有使用了rocketmq的服务，都加上rocketmq单独的日志appender。解决mq日志过大，容器占用磁盘的情况
|
4 years ago |
|
jianjun
|
d9c9b4d085
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
db2ea6e75c
|
避免空指针
|
4 years ago |
Jackwang
|
d95758e097
|
branchlist接口调整
|
4 years ago |
|
jianjun
|
6847bccdcd
|
居民导出 获取支部
|
4 years ago |
yinzuomei
|
580f883a8c
|
Merge remote-tracking branch 'origin/dev_zhili'
|
4 years ago |
|
yinzuomei
|
f9e1b30f56
|
服务过的需求列表
|
4 years ago |
HAHA
|
cc2a4be89c
|
sql
|
4 years ago |
|
HAHA
|
9da96bc9ac
|
完善逻辑
|
4 years ago |
|
HAHA
|
a139a36a55
|
添加量化积分统计的逻辑
|
4 years ago |
|
HAHA
|
aa2142491a
|
新增修改逻辑
|
4 years ago |
|
HAHA
|
a183ef5e4f
|
修改set字段
|
4 years ago |
|
HAHA
|
846a8a281b
|
空指针修复
|
4 years ago |
|
wangxianzhang
|
6e954ca9d1
|
修改：【居民信息导入】所属支部的查询调整
|
4 years ago |
|
zhangyuan
|
53fc5eb722
|
Merge branch 'feature/statistical_zhy'
|
4 years ago |
|
zhangyuan
|
3be8476f5d
|
防止空指针
|
4 years ago |
|
HAHA
|
04b39e1768
|
判断
|
4 years ago |
|
HAHA
|
d7b3dc1171
|
默认值0等等改
|
4 years ago |
|
zhangyuan
|
eb05d02cf1
|
Merge branch 'feature/statistical_zhy'
|
4 years ago |
|
HAHA
|
63efac033c
|
修改判断逻辑
|
4 years ago |
|
zhangyuan
|
3890c7da3e
|
调整合计的位置
|
4 years ago |
|
HAHA
|
f846648ee3
|
修改统计逻辑
|
4 years ago |
sunyuchao
|
4f06cbdc05
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
sunyuchao
|
75cebe497d
|
Merge branch 'dev_bugfix_ljj'
|
4 years ago |
|
wangxianzhang
|
a2bcf00622
|
Merge branch 'bugfix_resiimport_agencyerror'
|
4 years ago |
|
sunyuchao
|
58d959362c
|
居民信息修改 bug修复
|
4 years ago |
|
jianjun
|
c547f89630
|
Merge remote-tracking branch 'remotes/origin/dev_zhili'
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
891aae733a
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into bugfix_resiimport_agencyerror
|
4 years ago |
zhaoqifeng
|
aa1c85c2a2
|
Merge branch 'dev_party_mange'
|
4 years ago |
zxc
|
27e2ad1f33
|
协办单位微调
|
4 years ago |
|
zhangyuan
|
679afd76cd
|
fly位置错误
|
4 years ago |
