Commits · 2c6f6cf741c3778a681373f90d4054ea0fbb8047 · haoban3.0 / haoban-manage3.0 · GitLab

15 Jan, 2022 7 commits
- fix:好办登陆调整 · 2c6f6cf7
  墨竹 authored Jan 15, 2022
  
  2c6f6cf7 Browse Files
- feat：字修改 · 9f6a7538
  墨竹 authored Jan 15, 2022
  
  9f6a7538 Browse Files
- feat：bug修改 · 836269cb
  墨竹 authored Jan 15, 2022
  
  836269cb Browse Files
- feat：加密修改 · 8bdc00e0
  墨竹 authored Jan 15, 2022
  
  8bdc00e0 Browse Files
- feat：加密修改 · ca320b61
  墨竹 authored Jan 15, 2022
  
  ca320b61 Browse Files
- feat：登录修改 · 13af41f4
  墨竹 authored Jan 15, 2022
  
  13af41f4 Browse Files
- feat：删除无效代码 · f84fafa9
  墨竹 authored Jan 15, 2022
  
  f84fafa9 Browse Files
14 Jan, 2022 9 commits
- feat：删除无效代码 · 3fb40457
  墨竹 authored Jan 14, 2022
  
  3fb40457 Browse Files
- feat：登录兼容 · c302272a
  墨竹 authored Jan 14, 2022
  
  c302272a Browse Files
- feat：登录兼容 · b788df7d
  墨竹 authored Jan 14, 2022
  
  b788df7d Browse Files
- feat：登录兼容 · ab7e5560
  墨竹 authored Jan 14, 2022
  
  ab7e5560 Browse Files
- feat：bug修改 · e13759a1
  墨竹 authored Jan 14, 2022
  
  e13759a1 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 6452dad1
  墨竹 authored Jan 14, 2022
  
  6452dad1 Browse Files
- Merge branch 'master' into developer · 2dff81c6
  墨竹 authored Jan 14, 2022
  
  2dff81c6 Browse Files
- feat：bug修改 · 34043bda
  墨竹 authored Jan 14, 2022
  
  34043bda Browse Files
- feat:增加根据业务id删除待办 · d7427ae4
  fudahua authored Jan 14, 2022
  
  d7427ae4 Browse Files
13 Jan, 2022 19 commits
- Merge remote-tracking branch 'origin/developer' into developer · 5311d61b
  墨竹 authored Jan 13, 2022
  
  5311d61b Browse Files
- feat：删除无效代码 · dfaf34fc
  墨竹 authored Jan 13, 2022
  
  dfaf34fc Browse Files
- fix:igbore被删除了修复 · cf3a3039
  fudahua authored Jan 13, 2022
  
  cf3a3039 Browse Files
- fix:igbore被删除了修复 · c98c6563
  fudahua authored Jan 13, 2022
  
  c98c6563 Browse Files
- fix:igbore被删除了修复 · 680364ef
  fudahua authored Jan 13, 2022
  
  680364ef Browse Files
- fix:igbore被删除了修复 · 7a36c149
  fudahua authored Jan 13, 2022
  
  7a36c149 Browse Files
- fix:仅看自己 · 754de616
  fudahua authored Jan 13, 2022
  
  754de616 Browse Files
- Merge branch 'feature/01-10' · f5fcf30e
  墨竹 authored Jan 13, 2022
  
  f5fcf30e Browse Files
- Merge branch 'feature/01-10' into developer · f078543c
  墨竹 authored Jan 13, 2022
  
  f078543c Browse Files
- feat：好办助手群发bug修改 · 1999fd36
  墨竹 authored Jan 13, 2022
  
  1999fd36 Browse Files
- feat：好办助手群发bug修改 · 7a286de2
  墨竹 authored Jan 13, 2022
  
  7a286de2 Browse Files
- Merge branch 'feature/01-10' into developer · 4e6debdb
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
```
  墨竹 authored Jan 13, 2022
  4e6debdb Browse Files
- feat：好办助手群发bug修改 · 09da8e60
  墨竹 authored Jan 13, 2022
  
  09da8e60 Browse Files
- Merge branch 'feature/01-10' into developer · e7b08007
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
```
  墨竹 authored Jan 13, 2022
  e7b08007 Browse Files
- feat：好办助手群发bug修改 · 53deb05f
  墨竹 authored Jan 13, 2022
  
  53deb05f Browse Files
- Merge branch 'feature/01-10' into developer · eee1fa20
  墨竹 authored Jan 13, 2022
  
  eee1fa20 Browse Files
- feat：好办群发bug修改 · ef05a59c
  墨竹 authored Jan 13, 2022
  
  ef05a59c Browse Files
- Merge branch 'feature/01-10' into developer · 90bbadb5
  墨竹 authored Jan 13, 2022
  
  90bbadb5 Browse Files
- feat：好办群发bug修改 · 4c27b8e9
  墨竹 authored Jan 13, 2022
  
  4c27b8e9 Browse Files
12 Jan, 2022 5 commits
- Merge branch 'master' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · feb83697
  墨竹 authored Jan 12, 2022
  
  feb83697 Browse Files
- feat：通讯录同步bug修改 · 2226f004
  墨竹 authored Jan 12, 2022
  
  2226f004 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · d72f2181
  墨竹 authored Jan 12, 2022
  
  d72f2181 Browse Files
- Merge branch 'feature/01-10' into developer · 5d527d73
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
#	haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml
```
  墨竹 authored Jan 12, 2022
  5d527d73 Browse Files
- feat：通讯录同步bug修改 · a13a9080
  墨竹 authored Jan 12, 2022
  
  a13a9080 Browse Files