yinzuomei
|
9246e6df13
|
listresi试试
|
3 years ago |
|
yinzuomei
|
caa74b8ede
|
恢复
|
3 years ago |
zxc
|
3a3262ab73
|
调整
|
3 years ago |
syc
|
ba880d5c9c
|
Merge branch 'dev_project_hd_syc' into dev_jmreport
|
3 years ago |
|
yinzuomei
|
dd9e7cea8e
|
test
|
3 years ago |
|
zxc
|
5b3dde38ed
|
暂提
|
3 years ago |
|
yinzuomei
|
ccd9c8c5d3
|
orgProjectDetailList试下这个接口
|
3 years ago |
|
yinzuomei
|
0f05bf924f
|
合丢了吗？
|
3 years ago |
|
yinzuomei
|
127c10d6cb
|
Merge remote-tracking branch 'origin/dev_jmreport' into dev_jmreport
|
3 years ago |
|
yinzuomei
|
46b0781fde
|
fanhui key
|
3 years ago |
wangxianzhang
|
ac7fc2032b
|
【报表】增加AOP拦截器，和对应的注解，用于拦截url参数，给具有@RequestBody注解的入参赋值
|
3 years ago |
|
wangxianzhang
|
3cdb180a7d
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
|
3 years ago |
|
wangxianzhang
|
217e299291
|
【报表】增加AOP拦截器，和对应的注解，用于拦截url参数，给具有@RequestBody注解的入参赋值
|
3 years ago |
|
zxc
|
a391d13fae
|
编辑暂提
|
3 years ago |
|
yinzuomei
|
4156c3648b
|
删除没用的
|
3 years ago |
|
yinzuomei
|
353a5e45a6
|
Merge remote-tracking branch 'origin/dev_jmreport' into dev_jmreport
# Conflicts:
# epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java
# epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java
# epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java
|
3 years ago |
|
yinzuomei
|
e2ed87a469
|
功能类别字典
|
3 years ago |
|
zxc
|
dc83916024
|
名字
|
3 years ago |
|
zxc
|
345c885dac
|
列表
|
3 years ago |
|
zxc
|
cdd85d9346
|
暂提
|
3 years ago |
|
wangxianzhang
|
6f6c112157
|
【报表】增加commons-feignclient模块，用于调用报表服务
|
3 years ago |
|
syc
|
efbe5ef9d6
|
项目处理进展增加内部备注、处理中的附件等信息的返参
|
3 years ago |
|
zxc
|
c2a8f641ad
|
代码生成
|
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 |
|
yinzuomei
|
f9b5c74ddb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yinzuomei
|
b0db08200a
|
新增部门
|
3 years ago |
|
syc
|
9a4fa92cc2
|
Merge branch 'dev_project_hd_syc'
|
3 years ago |
|
syc
|
0c543dd1cc
|
应杨坤要求项目管理列表和导出的图片展示创建节点和结案节点的图片
|
3 years ago |
|
zxc
|
7df0589a97
|
添加客户ID
|
3 years ago |
|
zxc
|
a708356bb2
|
加白名单 略改
|
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 |
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 |
|
syc
|
2c78a9e163
|
。
|
3 years ago |
|
zhaoqifeng
|
39ca2f2271
|
Merge branch 'dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
768d0a60b6
|
网格员统计修改
|
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 |
|
syc
|
ff8c484bcd
|
增加返参
|
3 years ago |
|
yinzuomei
|
cb0fec563a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
1f9059e0d8
|
IcBulidingAddFormDTO.sort不判断孔了试试
|
3 years ago |
