jianjun
|
906538604d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
2ab866188c
|
项目进展 同步显示
|
3 years ago |
HAHA
|
941f135d7a
|
Merge branch 'Optimize_code_dev_1'
|
3 years ago |
|
HAHA
|
176d2edecf
|
开发环境排错
|
3 years ago |
|
HAHA
|
c36e804e21
|
开发环境排错
|
3 years ago |
|
HAHA
|
b1d39977dd
|
开发环境排错
|
3 years ago |
|
HAHA
|
d92daf531d
|
开发环境排错
|
3 years ago |
|
HAHA
|
4336747fb6
|
修改返回字段名
|
3 years ago |
|
HAHA
|
0404255b42
|
获取详情时同时获取网格排序字段
|
3 years ago |
|
HAHA
|
76195208f6
|
修改排序规则
|
3 years ago |
|
jianjun
|
7158f46c92
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22'
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
|
3 years ago |
|
jianjun
|
d67be733a3
|
组织code 变更时 发送消息携带 修改前的code，便于同步平阴数据时处理
|
3 years ago |
|
HAHA
|
b9631f647f
|
修改排序规则
|
3 years ago |
|
HAHA
|
3fd33e497c
|
修改排序规则
|
3 years ago |
|
HAHA
|
035102c0ed
|
修改排序规则
|
3 years ago |
zhangyuan
|
5845ebe6bb
|
Merge branch 'feature/visitor_zhy'
|
3 years ago |
zxc
|
1bed7d8884
|
Merge branch 'dev_bug_select_staff'
|
3 years ago |
|
zxc
|
b8651d565e
|
Merge branch 'dev_ic_user_match_grid'
|
3 years ago |
|
zxc
|
06ce0211b7
|
emm
|
3 years ago |
|
zxc
|
4456ea5d55
|
emm
|
3 years ago |
|
zhangyuan
|
a825c96b24
|
还原
|
3 years ago |
yinzuomei
|
f9b5c74ddb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yinzuomei
|
b0db08200a
|
新增部门
|
3 years ago |
|
zhangyuan
|
863b10523c
|
shandiao
|
3 years ago |
syc
|
9a4fa92cc2
|
Merge branch 'dev_project_hd_syc'
|
3 years ago |
|
syc
|
0c543dd1cc
|
应杨坤要求项目管理列表和导出的图片展示创建节点和结案节点的图片
|
3 years ago |
|
zhangyuan
|
945d6b602a
|
?
|
3 years ago |
|
zhangyuan
|
b0ae123722
|
试试
|
3 years ago |
|
zxc
|
7df0589a97
|
添加客户ID
|
3 years ago |
|
zxc
|
a708356bb2
|
加白名单 略改
|
3 years ago |
|
zhangyuan
|
b145fea023
|
试试
|
3 years ago |
|
zhangyuan
|
fc33938ce5
|
试试
|
3 years ago |
|
zxc
|
228151f933
|
匹配身份证
|
3 years ago |
|
syc
|
ac2792bb7f
|
Merge branch 'dev_project_hd_syc'
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
3 years ago |
|
zhangyuan
|
09b06d3300
|
冗余
|
3 years ago |
|
jianjun
|
6e808cf108
|
Merge remote-tracking branch 'remotes/origin/dev_project_process'
|
3 years ago |
zhaoqifeng
|
b89c1074f0
|
处理进展添加工作人员姓名
|
3 years ago |
|
zhaoqifeng
|
c0ce8983cb
|
处理进展添加工作人员姓名
|
3 years ago |
|
jianjun
|
937c1db3bc
|
Merge remote-tracking branch 'remotes/origin/dev_project_process'
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
3 years ago |
|
HAHA
|
9057c17187
|
bug
|
3 years ago |
|
syc
|
2c78a9e163
|
。
|
3 years ago |
|
zhaoqifeng
|
39ca2f2271
|
Merge branch 'dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
768d0a60b6
|
网格员统计修改
|
3 years ago |
|
HAHA
|
ddb23776aa
|
党建宣传-全部-新增-发布范围 修改排序
|
3 years ago |
|
syc
|
3042fc5cf7
|
。
|
3 years ago |
|
syc
|
02c8376402
|
。
|
3 years ago |
|
zhaoqifeng
|
cb37543287
|
Merge branch 'dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
c0a3010088
|
网格员统计修改
|
3 years ago |
|
syc
|
c9998ad0aa
|
bug修改
|
3 years ago |
|
HAHA
|
36bf8b3d95
|
党建宣传-全部-新增-发布范围 排序
|
3 years ago |
