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 |
|
zxc
|
afe087b97e
|
注释社区自组织成员联系方式格式校验
|
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 |
|
yinzuomei
|
2df56f947b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
111c5d4f59
|
去掉限制：活动报名截止时间应该大于当前时间
|
3 years ago |
|
yinzuomei
|
5e95c19daf
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
6c0de8bd2b
|
居民信息表单，单选组件默认否
|
3 years ago |
|
yinzuomei
|
dcbe44bc83
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
48c2aa20ed
|
数字社区初始化居民信息表单，基础信息组件groupId 修改。
|
3 years ago |
zhaoqifeng
|
b1f15de803
|
Merge branch 'feature/dev_sunjiatan'
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
3 years ago |
|
zhaoqifeng
|
43320c8410
|
人员与房屋信息不匹配error code
|
3 years ago |
|
yinzuomei
|
0200fcd5de
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
d465503f58
|
社区自组织创建时间
|
3 years ago |
|
zxc
|
a2ce97f755
|
Merge branch 'dev_0608fix'
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
|
3 years ago |
|
yinzuomei
|
e24285e5bd
|
Merge remote-tracking branch 'origin/dev_icservice'
|
3 years ago |
|
yinzuomei
|
fa104dd0e2
|
/residemand/mydemand
|
3 years ago |
|
zxc
|
93ba905d12
|
bug修复˚
|
3 years ago |
|
zhaoqifeng
|
7e5f828fdf
|
Merge branch 'feature/dev_sunjiatan'
|
3 years ago |
|
yinzuomei
|
b900eab931
|
联建单位删除是，如果存在未完成的需求不能删除
|
3 years ago |
|
zhaoqifeng
|
c1d3e8cf47
|
绑定房屋逻辑修改，不添加ic_resi_user信息
|
3 years ago |
|
zxc
|
ee5ecdf20d
|
bug修复˚
|
3 years ago |
|
zhaoqifeng
|
3b675b4c68
|
Merge branch 'feature/dev_sunjiatan'
|
3 years ago |
|
zhaoqifeng
|
7ecdf061df
|
绑定房屋逻辑修改，不添加ic_resi_user信息
|
3 years ago |
YUJT
|
c5c2ce5d78
|
Merge branch 'feature/dev_zz_wgh'
|
3 years ago |
HAHA
|
8ddadd948e
|
修改逻辑
|
3 years ago |
|
zxc
|
83c5fb3a0e
|
bug修复˚
|
3 years ago |
|
HAHA
|
9b0e939ad7
|
新增排序字段
|
3 years ago |
|
HAHA
|
d1f90696dd
|
添加排序规则
|
3 years ago |
zhangyuan
|
05539623eb
|
Merge branch 'feature/stat_bak'
|
3 years ago |
Jackwang
|
6f8dab6bf6
|
家庭成员详情为空处理
|
3 years ago |
|
yinzuomei
|
b2ae5d0206
|
删除社区自组织时存在未完成的服务不能删除
|
3 years ago |
|
Jackwang
|
daedfe7827
|
批量生成一户一码地址及房屋编码传参调整
|
3 years ago |
|
zhaoqifeng
|
c7c4b00710
|
Merge branch 'feature/dev_sunjiatan'
|
3 years ago |
|
zhaoqifeng
|
b8f6e82ca0
|
绑定房屋bug修改
|
3 years ago |
|
zhangyuan
|
b4fb28d1e0
|
单独分出组织查询功能
|
3 years ago |
|
yinzuomei
|
cea6ce416f
|
Merge remote-tracking branch 'origin/dev_0608fix'
|
3 years ago |
|
yinzuomei
|
d73a87d40a
|
反馈附件表存储反馈记录id
|
3 years ago |
|
yinzuomei
|
9f3f9b1271
|
反馈附件
|
3 years ago |
|
YUJT
|
bc79516bd9
|
Merge branch 'feature/dev_zz_wgh'
|
3 years ago |
