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 |
|
jianjun
|
ed89bff32e
|
更新居民的网格id 是小区修改所属网格触发
|
3 years ago |
wangxianzhang
|
a99e1e8703
|
Merge branches 'dev_bugfix_ljj' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
56e60425a0
|
-
|
3 years ago |
|
wangxianzhang
|
ea663d7deb
|
修改：【小区编辑】【居民编辑】【居民导入】增加客户级别分布式锁，不能同时进行
|
3 years ago |
|
jianjun
|
c7b8e07ce3
|
添加分布式锁
|
3 years ago |
sunyuchao
|
391fafc0ea
|
事件管理转需求时不在需要分类
|
3 years ago |
|
sunyuchao
|
958737e5cf
|
事件管理转需求时不在需要分类
|
3 years ago |
|
sunyuchao
|
685a7b1a92
|
分支错误
|
3 years ago |
|
sunyuchao
|
631948af9a
|
事件管理转需求 分类改为非必填
|
3 years ago |
zhaoqifeng
|
f764e227ba
|
房屋缓存添加自定义编码
|
3 years ago |
|
wangxianzhang
|
4f28800d4c
|
修复：compose文件错误
|
3 years ago |
yinzuomei
|
77e6ec1e07
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yinzuomei
|
3ff69b5375
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
7947d17fc7
|
物理删除试试
|
3 years ago |
|
wangxianzhang
|
5ea78330f4
|
调整：【控制台日志】修改logback-base.xml，避免生成spring.log文件
|
3 years ago |
|
wangxianzhang
|
ca60bc1cb5
|
调整：【docker-compose】日志滚动配置测试
|
3 years ago |
zxc
|
749985a89f
|
去除角色
|
3 years ago |
|
wangxianzhang
|
b0eb7bdbbe
|
调整：【docker-compose】日志滚动配置测试
|
3 years ago |
YUJT
|
44618c623f
|
Merge branch 'feature/teamB_zz_wgh_1'
|
3 years ago |
|
YUJT
|
248885397a
|
Merge branch 'bugfix/teamB_shuangshi'
|
3 years ago |
|
zxc
|
2ea13f98ee
|
去除无用字段
|
3 years ago |
|
zhaoqifeng
|
b3139e2307
|
事件上报优化
|
3 years ago |
|
sunyuchao
|
78ef588c74
|
Merge remote-tracking branch 'origin/dev_new_menu' into dev_new_menu
|
3 years ago |
|
sunyuchao
|
6654c75f5e
|
，
|
3 years ago |
|
zxc
|
ccba5b12d4
|
重名DTO微调
|
3 years ago |
|
zhaoqifeng
|
03dd61f514
|
事件上报优化
|
3 years ago |
|
yinzuomei
|
0425d82524
|
:
|
3 years ago |
|
yinzuomei
|
6cb04c0599
|
修改网格，修改组织后，删除epmet:org:temp:orgtree*相关key
|
3 years ago |
Jackwang
|
dfe7f3c7c9
|
我的信息添加是否显示家庭字段
|
3 years ago |
HAHA
|
3d288eac55
|
修改变更记录的isUserId
|
3 years ago |
|
sunyuchao
|
582f581899
|
Merge remote-tracking branch 'origin/dev_new_menu' into dev_new_menu
|
3 years ago |
|
HAHA
|
14a76e9788
|
修改sql
|
3 years ago |
|
HAHA
|
9fa96a869a
|
添加时间
|
3 years ago |
|
zxc
|
b847643a9f
|
emm
|
3 years ago |
|
sunyuchao
|
d995d608f0
|
。
|
3 years ago |
|
HAHA
|
ed52bb4010
|
添加变更记录
|
3 years ago |
|
sunyuchao
|
64eea8a862
|
不要在改需求了
|
3 years ago |
|
zxc
|
c990efda89
|
重名修改
|
3 years ago |
|
HAHA
|
4c11daab16
|
添加变更记录
|
3 years ago |
|
zxc
|
514e0af217
|
角色返回
|
3 years ago |
|
jianjun
|
263b0fbf94
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
HAHA
|
4c0af35564
|
查询近30天的数据
|
3 years ago |
|
HAHA
|
eba5b960eb
|
Merge branch 'feature/dev_zz_wgh' into feature/teamB_zz_wgh_1
|
3 years ago |
|
sunyuchao
|
e0c8a0d0d2
|
Merge remote-tracking branch 'origin/dev_new_menu' into dev_new_menu
|
3 years ago |
|
zxc
|
d34a9a49fd
|
角色控制菜单
|
3 years ago |
|
sunyuchao
|
c8bda44bce
|
角色
|
3 years ago |
|
yinzuomei
|
370e09ab2e
|
/icresiuser/ownerrelation限制status='0'
|
3 years ago |
|
zxc
|
8ab028af17
|
xin kai
|
3 years ago |
|
zxc
|
265ce7639c
|
emm
|
3 years ago |
