jianjun
|
13c0c70c3a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
|
4 years ago |
yinzuomei
|
ffcfcd9409
|
根组织不允许修改
|
4 years ago |
|
jianjun
|
5cf2ba01a4
|
stats ext 3g
|
4 years ago |
|
jianjun
|
3c393d1525
|
stats up
|
4 years ago |
|
jianjun
|
3194d5015d
|
stats up
|
4 years ago |
|
yinzuomei
|
63e26475ef
|
up
|
4 years ago |
|
yinzuomei
|
a56d51d233
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
19183cf986
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
281a0c9bc9
|
test
|
4 years ago |
|
yinzuomei
|
8b8a682740
|
+->,眼聋了
|
4 years ago |
|
yinzuomei
|
a4f6248951
|
msg152
|
4 years ago |
|
yinzuomei
|
fb6828fdcf
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
6860da8d6c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
f4279b481b
|
msg
|
4 years ago |
|
yinzuomei
|
0d0039dd5a
|
自定义编码，名称已存在，提示给用户 up
|
4 years ago |
|
yinzuomei
|
f3b24faa4a
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
2b01d18059
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
30cba2794b
|
自定义编码，名称已存在，提示给用户
|
4 years ago |
|
yinzuomei
|
24c57fb94a
|
150
|
4 years ago |
|
yinzuomei
|
01db88f311
|
Merge remote-tracking branch 'origin/dev'
|
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
|
1f364bebe8
|
pageNo+1 up
|
4 years ago |
|
jianjun
|
7c47906a4f
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
90263a50c8
|
pageNo+1 up
|
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 |
|
yinzuomei
|
3fe2021aca
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yinzuomei
|
c48f5c7603
|
gov-org 149
|
4 years ago |
|
jianjun
|
a212561c7c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
yinzuomei
|
495e31251b
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
812273e270
|
pageNo+1 up
|
4 years ago |
|
yinzuomei
|
c176519855
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
jianjun
|
6b1ceb0f91
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
2ee7f3db05
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
38c7eea3d0
|
灵山卫340
|
4 years ago |
|
yinzuomei
|
afcb2c464a
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
533b3c6aa3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
