yinzuomei
|
b768aed2e7
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
8b8a682740
|
+->,眼聋了
|
4 years ago |
yinzuomei
|
704369b313
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
f4279b481b
|
msg
|
4 years ago |
yinzuomei
|
30cba2794b
|
自定义编码,名称已存在,提示给用户
|
4 years ago |
yinzuomei
|
89205fd84c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
9e1ac20c36
|
自定义组织区划代码不允许修改
|
4 years ago |
yinzuomei
|
5ad68c140b
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
2d4c0c8641
|
编辑,选择其他,自定义编码
|
4 years ago |
yinzuomei
|
30ef70c7a1
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
f8fb7fe895
|
bugfix
|
4 years ago |
yinzuomei
|
238121f463
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
6700e048e7
|
修改了组织的areaCode, 部门和网格的置为空
|
4 years ago |
yinzuomei
|
08e8d0c7b1
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
aecf8c8245
|
修改组织
|
4 years ago |
zxc
|
0e41948d9e
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
zxc
|
7e9cc572a8
|
预约日期校验
|
4 years ago |
yinzuomei
|
6ea75ac3f6
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
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
|
9aa4f618e1
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
zxc
|
3f7bc9a8cd
|
预约日期返回
|
4 years ago |
sunyuchao
|
0bddbbb97f
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
sunyuchao
|
4f70907f03
|
应产品要求 需求调整
|
4 years ago |
sunyuchao
|
dabea28c39
|
Merge branch 'dev_routine_work' into develop
|
4 years ago |
sunyuchao
|
20aa12201d
|
bug修改
|
4 years ago |
yinzuomei
|
2f0ebd799c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
4dd690055b
|
评价内容审核非空
|
4 years ago |
wangxianzhang
|
01fef5a823
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
wangxianzhang
|
c57dd12e48
|
Merge branch 'wxz_blockchain' into develop
|
4 years ago |
wangxianzhang
|
3f7dd57edd
|
Merge remote-tracking branch 'origin/wxz_blockchain' into wxz_blockchain
|
4 years ago |
wangxianzhang
|
202f82f73f
|
111
|
4 years ago |
jianjun
|
7fdc8b3182
|
Merge remote-tracking branch 'remotes/origin/wxz_blockchain' into develop
|
4 years ago |
jianjun
|
abb047dc46
|
添加uid
|
4 years ago |
yinzuomei
|
d13d886d0a
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
c7ab35741b
|
查询修改下,赋值areaName
|
4 years ago |
wangxianzhang
|
ae19eea8e2
|
修改:
1.工作人员工作统计:导出excel,bean中数据类型修改
|
4 years ago |
yinzuomei
|
8aea495623
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
04a868e0fb
|
根组织不修改areaCode
|
4 years ago |
yinzuomei
|
ba13a95a21
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
8cdeaa6ead
|
bugfix
|
4 years ago |
yinzuomei
|
43a3797d1e
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
b6e0edfe4b
|
修改组织测试下
|
4 years ago |
wangxianzhang
|
995294fd6f
|
Merge branch 'wxz_blockchain' into develop
|
4 years ago |
wangxianzhang
|
ca536461f2
|
修改:
1.third bc dto实现序列化
|
4 years ago |
yinzuomei
|
369ebffaff
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
yinzuomei
|
deade0aeff
|
修改组织测试下
|
4 years ago |
wangxianzhang
|
c0e8ca91a3
|
Merge branch 'wxz_blockchain' into develop
|
4 years ago |
wangxianzhang
|
1498bc16c9
|
修改:
1.区块链上链调用third feign失败的测试
|
4 years ago |
sunyuchao
|
226c182842
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |