wangxianzhang
|
0e09ad43af
|
Merge branch 'dev_pingyin_7_22' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pingyin_7_22
|
3 years ago |
|
wangxianzhang
|
422b6b05ce
|
【对接库代码生成】
|
3 years ago |
sunyuchao
|
8f15203c0e
|
工作人员表新增身份证号字段
|
3 years ago |
|
wangxianzhang
|
e6b1e62080
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
|
wangxianzhang
|
7c1b6870d5
|
Merge branch 'pingyin_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
zhangyuan
|
fec6c9d231
|
flyway脚本
|
3 years ago |
wanggongfeng
|
5445aac167
|
人防统计BUG
|
3 years ago |
|
zhangyuan
|
0e3b1796d5
|
修改名称
|
3 years ago |
Jackwang
|
8f0c53b421
|
福利人员导出调整
|
3 years ago |
|
zhangyuan
|
184e1cf909
|
修改提示
|
3 years ago |
|
zhangyuan
|
6ebd4c765f
|
编辑
|
3 years ago |
|
zhangyuan
|
29a925e6ce
|
新版增加
|
3 years ago |
|
zhangyuan
|
47e40e6059
|
登陆验证方法追加
|
3 years ago |
|
zhangyuan
|
10a3dfaefd
|
bug
|
3 years ago |
|
zhangyuan
|
293cf49010
|
增加错误信息
|
3 years ago |
|
zhangyuan
|
a85cbb8986
|
修改bug
|
3 years ago |
|
zhangyuan
|
379e9e27bb
|
修改类名和注释
|
3 years ago |
|
zhangyuan
|
fc3d1ab3f3
|
bug
|
3 years ago |
|
zhangyuan
|
7cb50e6848
|
第二个登录接口
|
3 years ago |
|
zhangyuan
|
aac7da2598
|
no message
|
3 years ago |
jianjun
|
c2cdccb738
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
d0b1f89461
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
38f4858ca5
|
打印下日志
|
3 years ago |
|
wanggongfeng
|
e2450dba13
|
Merge branch 'feature/dev_union'
|
3 years ago |
|
wanggongfeng
|
daa94615bd
|
Merge branch 'feature/dev_union'
|
3 years ago |
|
zhangyuan
|
a234a27c5a
|
账号密码登录
|
3 years ago |
|
zhangyuan
|
802222275f
|
回显客户名称
|
3 years ago |
|
zhangyuan
|
0ad8be25e9
|
bug
|
3 years ago |
|
wanggongfeng
|
13e122a348
|
组装客户树
|
3 years ago |
|
zhangyuan
|
ca4a0f97ba
|
bug
|
3 years ago |
|
zhangyuan
|
4c0fceac73
|
补充完善
|
3 years ago |
|
zhangyuan
|
6f0f4f2ea9
|
完善客户树
|
3 years ago |
|
zhangyuan
|
abc71d9299
|
bug修复
|
3 years ago |
|
zhangyuan
|
c83b381009
|
bug
|
3 years ago |
|
zhangyuan
|
02077403e3
|
bug修复
|
3 years ago |
|
zhangyuan
|
53f0aebd11
|
update
|
3 years ago |
|
jianjun
|
d2a87b6a57
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
a7cf616705
|
更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
|
3 years ago |
|
jianjun
|
2fc4c03955
|
更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
|
3 years ago |
|
jianjun
|
4944932d09
|
更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
|
3 years ago |
|
jianjun
|
db25cf00b2
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
cb880d510f
|
注掉更新房屋内的居民数 这个压力太大 待优化
|
3 years ago |
|
jianjun
|
68466fd760
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
73e1d4fa01
|
更新小区时需要更新对应的小区里的居民
|
3 years ago |
yinzuomei
|
c577c1696b
|
listresi，groupby换下位置
|
3 years ago |
|
jianjun
|
845a89b45f
|
更新小区时需要更新对应的小区里的居民
|
3 years ago |
|
jianjun
|
74ee47f64e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
ef48136aea
|
更新居民的网格id 是小区修改所属网格触发
|
3 years ago |
|
jianjun
|
074470bdd6
|
更新居民的网格id 是小区修改所属网格触发
|
3 years ago |
|
jianjun
|
1d8491f1fd
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
3 years ago |
