Commits · 816f6f0f705b3614ab751b7e03096f10bd53d62c · haoban3.0 / haoban-manage3.0 · GitLab

20 Dec, 2021 3 commits
- 消息通知接口以及发送通知接口 · 816f6f0f
  fudahua authored Dec 20, 2021
  
  816f6f0f Browse Files
- Merge remote-tracking branch 'origin/developer' into feature-daiban-12-14 · a5b1f236
  fudahua authored Dec 20, 2021
  
  a5b1f236 Browse Files
- 消息通知 · 030e1f53
  fudahua authored Dec 20, 2021
  
  030e1f53 Browse Files
17 Dec, 2021 22 commits
- 待办以及消息 · 13992312
  fudahua authored Dec 17, 2021
  
  13992312 Browse Files
- 待办以及消息 · b80e5084
  fudahua authored Dec 17, 2021
  
  b80e5084 Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 02639d67
```
待办以及消息

See merge request !137
```
  fudahua authored Dec 17, 2021
  02639d67 Browse Files
- 待办以及消息 · cfb27a45
  fudahua authored Dec 17, 2021
  
  cfb27a45 Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 1099443f
```
待办以及消息

See merge request !136
```
  fudahua authored Dec 17, 2021
  1099443f Browse Files
- 待办以及消息 · ef70f995
  fudahua authored Dec 17, 2021
  
  ef70f995 Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 1c7a301e
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/NotifyController.java
```
  fudahua authored Dec 17, 2021
  1c7a301e Browse Files
- 待办以及消息 · b63e78b6
  fudahua authored Dec 17, 2021
  
  b63e78b6 Browse Files
- 根据手机号查看列表 · f14acd83
  fudahua authored Dec 17, 2021
  
  f14acd83 Browse Files
- 根据手机号查看列表 · 211bd6d3
  fudahua authored Dec 17, 2021
  
  211bd6d3 Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0 into developer · 5a172c6a
  fudahua authored Dec 17, 2021
  
  5a172c6a Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 140f9e2f
```
Feature daiban 12 14

See merge request !134
```
  fudahua authored Dec 17, 2021
  140f9e2f Browse Files
- 根据手机号查看列表 · d3077062
  fudahua authored Dec 17, 2021
  
  d3077062 Browse Files
- Merge branch 'feature/login-token' into developer · 63ce9493
  墨竹 authored Dec 17, 2021
  
  63ce9493 Browse Files
- feat:欢迎语修改 · ea9010c7
  墨竹 authored Dec 17, 2021
  
  ea9010c7 Browse Files
- Merge branch 'feature/login-token' into developer · fd1e0419
  墨竹 authored Dec 17, 2021
  
  fd1e0419 Browse Files
- feat:欢迎语修改 · f9c4dd95
  墨竹 authored Dec 17, 2021
  
  f9c4dd95 Browse Files
- Merge branch 'feature/login-token' into developer · 100d8e41
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
```
  墨竹 authored Dec 17, 2021
  100d8e41 Browse Files
- feat:欢迎语修改 · a02fedf4
  墨竹 authored Dec 17, 2021
  
  a02fedf4 Browse Files
- Merge branch 'feature/login-token' into developer · b2eb9773
  墨竹 authored Dec 17, 2021
  
  b2eb9773 Browse Files
- feat:欢迎语增加图片 · 6cd82673
  墨竹 authored Dec 17, 2021
  
  6cd82673 Browse Files
- feat:欢迎语增加图片 · a520636d
  墨竹 authored Dec 17, 2021
  
  a520636d Browse Files
16 Dec, 2021 15 commits
- feat:登录token增加code · bd40e37e
  墨竹 authored Dec 16, 2021
  
  bd40e37e Browse Files
- 待办-待办任务 · 684979bc
  fudahua authored Dec 16, 2021
  
  684979bc Browse Files
- Merge branch 'feature/login-token' into developer · c135396d
  墨竹 authored Dec 16, 2021
  
  c135396d Browse Files
- feat:隐私修改 · b110b6a4
  墨竹 authored Dec 16, 2021
  
  b110b6a4 Browse Files
- Merge branch 'feature/login-token' into developer · 8c143302
  墨竹 authored Dec 16, 2021
  
  8c143302 Browse Files
- feat:增加查询头像字段 · 4ea29481
  墨竹 authored Dec 16, 2021
  
  4ea29481 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · d0413da5
  墨竹 authored Dec 16, 2021
  
  d0413da5 Browse Files
- Merge branch 'feature/login-token' into developer · 4e367a3e
  墨竹 authored Dec 16, 2021
  
  4e367a3e Browse Files
- feat:跳过接口 · 50c429a0
  墨竹 authored Dec 16, 2021
  
  50c429a0 Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 414942ff
```
待办-今日待办

See merge request !133
```
  fudahua authored Dec 16, 2021
  414942ff Browse Files
- Merge branch 'feature/login-token' into developer · 72448ccf
  墨竹 authored Dec 16, 2021
  
  72448ccf Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e45d462b
  墨竹 authored Dec 16, 2021
  
  e45d462b Browse Files
- feat:打开拦截器 · 438524ea
  墨竹 authored Dec 16, 2021
  
  438524ea Browse Files
- feat:打开拦截器 · 44820140
  墨竹 authored Dec 16, 2021
  
  44820140 Browse Files
- 待办-今日待办 · 3297d312
  fudahua authored Dec 16, 2021
  
  3297d312 Browse Files