jianjun
|
013de8a8a1
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
483209b461
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
81035d2cd3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
c6e0295ad2
|
房屋模板添加 3:未出售 状态
|
3 years ago |
yinzuomei
|
970216c123
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
ad55db68bd
|
"my-subagency-list"当前工作人员所属组织及下级组织树，不包含网格
|
3 years ago |
zhaoqifeng
|
fa97a889cd
|
Merge branch 'dev_party_mange'
|
3 years ago |
|
zhaoqifeng
|
26d533877d
|
bug修改
|
3 years ago |
|
jianjun
|
cc5c0466d9
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
zhaoqifeng
|
12e1e3d4bd
|
Merge branch 'dev_party_mange'
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
|
3 years ago |
|
jianjun
|
ea83097f69
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
22cc7c4507
|
房屋添加 3:未出售 状态
|
3 years ago |
zxc
|
a5f04bae64
|
分类列表
|
3 years ago |
|
zhaoqifeng
|
7e89ab9602
|
bug修改
|
3 years ago |
|
zhaoqifeng
|
a49401ab96
|
bug修改
|
3 years ago |
YUJT
|
300ab5441c
|
Merge branch 'dev_party_mange'
|
3 years ago |
|
YUJT
|
58e4871df9
|
修改sql
|
3 years ago |
|
jianjun
|
2e76a8374c
|
Merge branch 'dev_checksetting_brefore_audit' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
c49f8d32ca
|
代码审核bug
|
3 years ago |
|
jianjun
|
114326db7e
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
23c33772d8
|
Merge branch 'dev_checksetting_brefore_audit' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
db44a37960
|
代码审核
|
3 years ago |
|
YUJT
|
189722e8b8
|
Merge branch 'dev_party_mange'
|
3 years ago |
|
YUJT
|
737d4baca0
|
联建活动 查询功能修改
|
3 years ago |
|
yinzuomei
|
204372dff2
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
c88608d557
|
查需求分类默认空
|
3 years ago |
wangxianzhang
|
7352ce69a7
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
632846bbfa
|
工作人员登录，没有部门列表，缓存[]，而不是null
|
3 years ago |
|
yinzuomei
|
ede123590c
|
Merge remote-tracking branch 'origin/dev_icservice'
|
3 years ago |
|
YUJT
|
f7795fc587
|
Merge branch 'dev_party_mange'
|
3 years ago |
|
yinzuomei
|
249326e0d2
|
user-client:UserBaseInfoResultDTO.userWechatResultDTO注释
|
3 years ago |
|
yinzuomei
|
0d5945a253
|
Merge remote-tracking branch 'origin/dev_change_communitySelfOrganization'
|
3 years ago |
|
yinzuomei
|
6aa404deda
|
议题表决添加防重
|
3 years ago |
|
yinzuomei
|
d95c5e0109
|
Merge remote-tracking branch 'origin/dev_change_communitySelfOrganization'
|
3 years ago |
|
yinzuomei
|
3bc6e081f6
|
icEventxxxcx默认0
|
3 years ago |
|
yinzuomei
|
5bdf0b3715
|
Merge remote-tracking branch 'origin/dev_change_communitySelfOrganization'
|
3 years ago |
|
yinzuomei
|
d83b37d059
|
未匹配到分类的默认是其他
|
3 years ago |
zhangyuan
|
01f7b07f25
|
agency指的是社区
|
3 years ago |
|
yinzuomei
|
64fb468cf2
|
Merge branches 'dev_change_communitySelfOrganization' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_change_communitySelfOrganization
|
3 years ago |
|
jianjun
|
8b3945f113
|
Merge remote-tracking branch 'remotes/origin/dev_checksetting_brefore_audit'
|
3 years ago |
|
jianjun
|
3417f431ad
|
微信小程序提审前校验并设置用户隐私设置
|
3 years ago |
|
wangxianzhang
|
cd79bec6d5
|
居民信息导入，从表去掉REMARKS字段insert，防止报错
|
3 years ago |
|
wangxianzhang
|
a92ee36a15
|
居民信息导入，查询remote数据的时候先判断，没填就不查询
|
3 years ago |
|
YUJT
|
876335346b
|
合并sunjiatan到master
|
3 years ago |
|
yinzuomei
|
9176a251e4
|
发下开发试试吧
|
3 years ago |
|
zhaoqifeng
|
d25b1c96cf
|
申请积分，总分查询接口
|
3 years ago |
|
yinzuomei
|
6a9cab1532
|
backmore
|
3 years ago |
|
yinzuomei
|
3dc38ceae2
|
back
|
3 years ago |
|
yinzuomei
|
c2d7289a42
|
try
|
3 years ago |
|
yinzuomei
|
9b92a536c1
|
拉去了一下master
|
3 years ago |
