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 |
|
yinzuomei
|
a1d9c6b677
|
Merge branches 'dev_change_communitySelfOrganization' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_change_communitySelfOrganization
Conflicts:
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
|
3 years ago |
zxc
|
d068f4eca5
|
emm
|
3 years ago |
Jackwang
|
396abb2a4b
|
新增家庭成员添加更新信息
|
3 years ago |
|
zxc
|
afe087b97e
|
注释社区自组织成员联系方式格式校验
|
3 years ago |
|
Jackwang
|
ac6f31a40c
|
新增家庭成员添加更新信息-添加调动记录-补充staffId字段
|
3 years ago |
|
Jackwang
|
f41c67f2f2
|
新增家庭成员添加更新信息-添加调动记录-补充客户id字段
|
3 years ago |
|
Jackwang
|
cd9eaf8951
|
新增家庭成员添加更新信息-添加调动记录
|
3 years ago |
|
yinzuomei
|
88d0249405
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
9efd285737
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
yinzuomei
|
d330fbb123
|
社区自组织导入error
|
3 years ago |
|
jianjun
|
c054cc35ed
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
8ce8a1ab82
|
画区域时也可以同时更新经纬度 正则校验
|
3 years ago |
|
jianjun
|
cf60b2ece5
|
画区域时也可以同时更新经纬度 正则校验
|
3 years ago |
|
jianjun
|
54ca64cc7a
|
画区域时也可以同时更新经纬度
|
3 years ago |
|
zxc
|
ba8471b1ec
|
注释社区自组织成员联系方式格式校验
|
3 years ago |
wanggongfeng
|
c5acdbb09e
|
人房统计bug
|
3 years ago |
|
Jackwang
|
c5d5fde7b1
|
新增家庭成员添加更新信息
|
3 years ago |
|
zhaoqifeng
|
b5488fdf4e
|
居民和党员信息同步bug修改 是否免学习没有值
|
3 years ago |
|
Jackwang
|
bbce407053
|
修改描述
|
3 years ago |
|
Jackwang
|
d284393ed7
|
新增家庭成员添加更新信息
|
3 years ago |
|
Jackwang
|
d5c8d9af52
|
下载zip按照社区、小区、楼栋区分
|
3 years ago |
|
YUJT
|
ac3056b84c
|
Merge branch 'master' into dev_party_mange
# Conflicts:
# epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
# epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
|
3 years ago |
|
YUJT
|
d3113e6d43
|
量化积分列表查询修改
|
3 years ago |
|
Jackwang
|
6fda7a5d57
|
获取上级党组织列表调整
|
3 years ago |
|
YUJT
|
7bd5d2bb4f
|
删除无效依赖
|
3 years ago |
|
zhaoqifeng
|
21f9aed5aa
|
居民和党员信息同步bug修改
|
3 years ago |
HAHA
|
141f51186a
|
修改分页
|
3 years ago |
|
zhaoqifeng
|
3bd914ccf8
|
Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
|
3 years ago |
|
zhaoqifeng
|
5e5a467b63
|
缴费记录bug修改
|
3 years ago |
