yinzuomei
|
6860da8d6c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
f4279b481b
|
msg
|
4 years ago |
|
yinzuomei
|
2b01d18059
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
30cba2794b
|
自定义编码，名称已存在，提示给用户
|
4 years ago |
|
yinzuomei
|
c539a319cb
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
9e1ac20c36
|
自定义组织区划代码不允许修改
|
4 years ago |
|
yinzuomei
|
2d4c0c8641
|
编辑，选择其他，自定义编码
|
4 years ago |
jianjun
|
d0bf58b25e
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_routine_work
|
4 years ago |
|
jianjun
|
3f2323b1d8
|
pageNo+1
|
4 years ago |
|
jianjun
|
586d7fed07
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e579bd4e3e
|
Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
0dfa97a374
|
pageNo+1
|
4 years ago |
|
yinzuomei
|
641c82124c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
f8fb7fe895
|
bugfix
|
4 years ago |
|
yinzuomei
|
6700e048e7
|
修改了组织的areaCode， 部门和网格的置为空
|
4 years ago |
|
yinzuomei
|
aecf8c8245
|
修改组织
|
4 years ago |
zxc
|
7e9cc572a8
|
预约日期校验
|
4 years ago |
|
yinzuomei
|
c994dd5ee0
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
a82c13469f
|
预约类型，每天：everyDay，工作日：workDay，周末：weekend
|
4 years ago |
|
zxc
|
3f7bc9a8cd
|
预约日期返回
|
4 years ago |
|
yinzuomei
|
533b3c6aa3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
f34d32810d
|
脑子瓦特了
|
4 years ago |
sunyuchao
|
4c828a7dd0
|
Merge branch 'dev_ic_mp' into dev
|
4 years ago |
|
sunyuchao
|
4f70907f03
|
应产品要求 需求调整
|
4 years ago |
|
yinzuomei
|
c7d7f06971
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e0a03528ed
|
灵山卫客户
|
4 years ago |
|
yinzuomei
|
741342d3d3
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
sunyuchao
|
a493a1cc18
|
Merge branch 'dev_routine_work' into dev
|
4 years ago |
|
sunyuchao
|
20aa12201d
|
bug修改
|
4 years ago |
wangxianzhang
|
a6829ccbc1
|
修改：
1。网格员数据统计-分页被手误的注释掉了
|
4 years ago |
|
jianjun
|
74a0d3a696
|
Merge remote-tracking branch 'remotes/origin/dev_hotfix' into dev
|
4 years ago |
|
yinzuomei
|
4dd690055b
|
评价内容审核非空
|
4 years ago |
|
wangxianzhang
|
6167404194
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
47c9e92540
|
修改：
1.CustomerOrgRedis中未找到网格不抛异常，改由业务代码处理
|
4 years ago |
|
yinzuomei
|
de8c8f1dfd
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
c7ab35741b
|
查询修改下，赋值areaName
|
4 years ago |
|
wangxianzhang
|
fcc25cdce8
|
Merge branch 'dev_routine_work' into dev
|
4 years ago |
|
wangxianzhang
|
ae19eea8e2
|
修改：
1.工作人员工作统计：导出excel，bean中数据类型修改
|
4 years ago |
|
yinzuomei
|
04a868e0fb
|
根组织不修改areaCode
|
4 years ago |
|
yinzuomei
|
8cdeaa6ead
|
bugfix
|
4 years ago |
|
yinzuomei
|
b6e0edfe4b
|
修改组织测试下
|
4 years ago |
|
jianjun
|
46b332bdf1
|
Merge remote-tracking branch 'remotes/origin/dev_ic_mp' into dev
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
|
4 years ago |
|
yinzuomei
|
deade0aeff
|
修改组织测试下
|
4 years ago |
|
sunyuchao
|
0aab5c5639
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
11e6566b8a
|
......
|
4 years ago |
|
zxc
|
9edee12fa3
|
边框
|
4 years ago |
|
jianjun
|
f059a9ccf9
|
巡查显示小时分钟 没有为0
|
4 years ago |
|
zxc
|
be0c5f97a3
|
预约时间段
|
4 years ago |
|
jianjun
|
89c8b9b644
|
巡查显示小时分钟
|
4 years ago |
|
jianjun
|
1a8730d7ed
|
Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_routine_work
|
4 years ago |
