lichao
|
0a85080a93
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
c2d026d09f
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
049c9b47af
|
新增客户修改
|
2 years ago |
yinzuomei
|
fe1479c077
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
48183b6fe8
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
1de597c2c2
|
dictOption/{dictType}
|
2 years ago |
|
lichao
|
e6a296ddaf
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
05f60d3778
|
新增详情
|
2 years ago |
|
lichao
|
7eb166e073
|
修改组织
|
2 years ago |
|
yinzuomei
|
c35180fec0
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
e645887c25
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
d3009dfeaf
|
新增和编辑居民，证件类型必填
|
2 years ago |
|
lichao
|
748d5a375c
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
6f58e99138
|
房屋新增
|
2 years ago |
|
yinzuomei
|
8ed6ceb97b
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
6453e1c296
|
区县、街道、社区下拉框
|
2 years ago |
|
yinzuomei
|
1d6f0a7854
|
楼栋单元长fix
|
2 years ago |
|
yinzuomei
|
9e75d3f936
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
# Conflicts:
# epmet-cloud-generator/src/main/resources/application.yml
|
2 years ago |
|
yinzuomei
|
eab3d329f1
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
923997363b
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
6349bdc821
|
烟台需求、新增小区
|
2 years ago |
|
yinzuomei
|
0efcc3578f
|
楼栋单元长
|
2 years ago |
|
yinzuomei
|
0f0099afdc
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
2a2511d3e1
|
gov/org/propertymanagement/page新增联系人，联系电话
|
2 years ago |
|
lichao
|
a1f3b4579d
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
31fee9c480
|
烟台需求、新增组织字段
|
2 years ago |
|
yinzuomei
|
6760a04f21
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
345b07392b
|
Merge branch 'yantai_zhengwu_master' into dev
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java
# epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
|
2 years ago |
|
yinzuomei
|
3d72b83b87
|
gov/org/propertymanagement/page新增联系人，联系电话
|
2 years ago |
|
lichao
|
8ae98006d2
|
用户详情、修改
|
2 years ago |
|
yinzuomei
|
a544dcf96e
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
52c573be18
|
ic_property_management表新增联系人，联系电话
|
2 years ago |
|
lichao
|
b3dfe459a2
|
冲突解决
|
2 years ago |
|
lichao
|
0c42e94cc5
|
Merge branch 'yantai_zhengwu_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
|
2 years ago |
|
lichao
|
d131fd9581
|
通讯录新增烟台需求字段
|
2 years ago |
|
yinzuomei
|
eea41134b6
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
2f8ff0b366
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
2 years ago |
|
yinzuomei
|
c0b8e88121
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
b511b7a667
|
FINISH_SEND_TIME
|
2 years ago |
|
yinzuomei
|
690256a7f7
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
330e2bfc82
|
/message/organization/message/list;NullPointerException
|
2 years ago |
|
yinzuomei
|
68887bbeb6
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
30c353f013
|
bugfix
|
2 years ago |
|
yinzuomei
|
875324143e
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
f8c5ae7324
|
发送消息
|
2 years ago |
wxz
|
63810e45b0
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
4f23043d56
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
wxz
|
7659d2fc44
|
1.修改：删除文章栏目。禁止删除一级栏目
|
2 years ago |
|
yinzuomei
|
e037148819
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
09fc9988fb
|
保存了内容，还没发消息
|
2 years ago |
