sunyuchao
|
54ea358ec4
|
业务域名改为非必填
|
5 years ago |
jianjun
|
580d0df7ad
|
Merge remote-tracking branch 'remotes/origin/dev_report_bugfix' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
|
5 years ago |
yinzuomei
|
61dbe2c30a
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
5 years ago |
|
yinzuomei
|
fe69f95eb5
|
添加区编码修改
|
5 years ago |
|
jianjun
|
c50c132dcf
|
难点堵点-查询列表 如果内容为空则返回标题
|
5 years ago |
|
sunyuchao
|
34de2cb138
|
Merge branch 'dev_project_approval' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
|
5 years ago |
|
sunyuchao
|
41032cf2f6
|
项目立项 内部备注必填
|
5 years ago |
|
jianjun
|
edaeb3c063
|
难点堵点-定时抽取
|
5 years ago |
|
yinzuomei
|
318ecb2e18
|
del_flag='0'
|
5 years ago |
zxc
|
b674b20bfd
|
项目分类 org 多客户修改【同单客户一样】
|
5 years ago |
|
yinzuomei
|
2cfcc115df
|
Merge remote-tracking branch 'origin/dev_flyway_scripts' into dev_temp
|
5 years ago |
|
jianjun
|
ff4f5ffc70
|
难点堵点-项目分类
|
5 years ago |
|
zxc
|
533e51254d
|
项目分类 org 单客户修改
|
5 years ago |
|
zxc
|
b3c891ae5b
|
项目分类 org 单客户修改
|
5 years ago |
|
yinzuomei
|
ca36e01dc8
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
5 years ago |
|
yinzuomei
|
ffd3d6252f
|
nextlevelareacodelist修改
|
5 years ago |
|
yinzuomei
|
a4dfa14021
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
5 years ago |
|
yinzuomei
|
50554d2216
|
"agencydetail"修改
|
5 years ago |
|
yinzuomei
|
aaa507c97a
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
5 years ago |
|
yinzuomei
|
45008813d2
|
"editagency"修改
|
5 years ago |
|
jianjun
|
2f5efbca71
|
难点堵点代码暂存-基本没问题了；还需要调整项目分类
|
5 years ago |
|
yinzuomei
|
dd128215d6
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
5 years ago |
|
yinzuomei
|
c4f6d4469c
|
"editagency"修改
|
5 years ago |
|
yinzuomei
|
d2496e0090
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
5 years ago |
|
yinzuomei
|
807c78ccbc
|
组织区划：市级列表不展示其他
|
5 years ago |
|
yinzuomei
|
a303849b1c
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
5 years ago |
|
sunyuchao
|
41c43487b9
|
Merge branch 'dev_project_approval' into dev_temp
|
5 years ago |
|
sunyuchao
|
329ea9ba77
|
Merge remote-tracking branch 'origin/dev_project_approval' into dev_project_approval
|
5 years ago |
|
sunyuchao
|
77b3266a1e
|
项目分类保存接口调整 兼容立项类型项目分类保存
|
5 years ago |
|
yinzuomei
|
4153d52873
|
新增组织V2接口提交
|
5 years ago |
wxz
|
4e74c87786
|
Merge branch 'dev_openapi' into dev
|
5 years ago |
|
jianjun
|
4a82ca3292
|
难点堵点代码暂存
|
5 years ago |
|
yinzuomei
|
8f45230cc3
|
Merge remote-tracking branch 'origin/dev_visit_group' into dev
|
5 years ago |
|
yinzuomei
|
89acf1aea3
|
组织机构新增area_code，db相关修改
|
5 years ago |
|
yinzuomei
|
52add5bde1
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
5 years ago |
|
yinzuomei
|
9df85e7e4a
|
新增组织V2接口提交
|
5 years ago |
|
sunyuchao
|
f2c489bd69
|
Merge branch 'dev_project_approval' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
|
5 years ago |
|
wxz
|
e3859f1f13
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wxz
|
af4e5489b4
|
Merge branch 'dev_openapi' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
wxz
|
5186720b1d
|
重新添加误删的模块
|
5 years ago |
|
sunyuchao
|
3f5e3c665a
|
dev分支合到dev_add_customer_id分支
|
5 years ago |
|
sunyuchao
|
b53b94cc49
|
Merge branches 'dev' and 'dev_add_customer_id' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_add_customer_id
Conflicts:
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
|
5 years ago |
|
zxc
|
065ce35f5e
|
事件分析组织-月 统计 微调
|
5 years ago |
|
wxz
|
e27fbc3c1a
|
修改：openApi验签部分，修改返回提示
|
5 years ago |
|
zxc
|
ecb8426bdf
|
事件分析组织-天 统计 添加组织立项逻辑
|
5 years ago |
|
wxz
|
0556718666
|
Merge branch 'dev' into dev_openapi
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
sunyuchao
|
789470302f
|
项目立项
|
5 years ago |
|
yinzuomei
|
f77163b57d
|
组织区划下拉框接口V2
|
5 years ago |
|
yinzuomei
|
588add80cc
|
组织区划下拉框接口V1
|
5 years ago |
|
jianjun
|
7a1c7ad30a
|
项目主表 gridId添加默认值为emptyString
|
5 years ago |
