Commits · 58a69d73f24d6838f18af4a42dc09b64d9b8adf4 · haoban3.0 / haoban-manage3.0

17 Feb, 2022 11 commits
- 查询使用部门列表修复 · 58a69d73
  xugaojun authored Feb 17, 2022
  
  58a69d73 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 4733fbab
  xugaojun authored Feb 17, 2022
  
  4733fbab Browse Files
- mediaSize类型变更 · 91b6acf9
  xugaojun authored Feb 17, 2022
  
  91b6acf9 Browse Files
- feat：欢迎语修改 · be139cd6
  墨竹 authored Feb 17, 2022
  
  be139cd6 Browse Files
- feat：删除无效代码 · cb392c20
  墨竹 authored Feb 17, 2022
  
  cb392c20 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 39169afe
  墨竹 authored Feb 17, 2022
  
  39169afe Browse Files
- feat：删除无效代码 · 928472b9
  墨竹 authored Feb 17, 2022
  
  928472b9 Browse Files
- 修复一个查询问题 · 670a818a
  xugaojun authored Feb 17, 2022
  
  670a818a Browse Files
- 更改小程序名称和字段名 · 5246e4bd
  xugaojun authored Feb 17, 2022
  
  5246e4bd Browse Files
- 添加新增欢迎语更新时间 · 5f7bc606
  xugaojun authored Feb 17, 2022
  
  5f7bc606 Browse Files
- fix:修复标题查询问题 · 912f372e
  xugaojun authored Feb 17, 2022
  
  912f372e Browse Files
16 Feb, 2022 10 commits
- fix:修复一个查询问题 · 1f451315
  xugaojun authored Feb 16, 2022
  
  1f451315 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · a3bd9a3d
  墨竹 authored Feb 16, 2022
  
  a3bd9a3d Browse Files
- feat：删除无效代码 · fc291823
  墨竹 authored Feb 16, 2022
  
  fc291823 Browse Files
- 欢迎语新增小程序和媒体大小 · 8fbc2017
  yaosai authored Feb 16, 2022
  
  8fbc2017 Browse Files
- fix:修复一个参数导致的空指针问题 · 06f51cb5
  xugaojun authored Feb 16, 2022
  
  06f51cb5 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ea6ec1e3
  xugaojun authored Feb 16, 2022
  
  ea6ec1e3 Browse Files
- fix:修复一个lambda接收数据问题 · 80d967ec
  xugaojun authored Feb 16, 2022
  
  80d967ec Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ffee5f9d
  墨竹 authored Feb 16, 2022
  
  ffee5f9d Browse Files
- Merge branch 'feature-02-22' into developer · 1f491a1c
  墨竹 authored Feb 16, 2022
  
  1f491a1c Browse Files
- feat：增加判断 · c73a4862
  墨竹 authored Feb 16, 2022
  
  c73a4862 Browse Files
15 Feb, 2022 11 commits
- Merge branch 'bugfix-0215' into 'developer' · b42924fb
```
Bugfix 0215

See merge request !169
```
  yaosai authored Feb 15, 2022
  b42924fb Browse Files
- Merge branch 'developer' into 'bugfix-0215' · 01e75bb4
```
# Conflicts:
#   haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java
```
  yaosai authored Feb 15, 2022
  01e75bb4 Browse Files
- 企业微信openId兼容 · 03761022
  yaosai authored Feb 15, 2022
  
  03761022 Browse Files
- 查询欢迎语，为空返回空集合 · ee19851f
  xugaojun authored Feb 15, 2022
  
  ee19851f Browse Files
- long精度问题 · 789bdbcd
  xugaojun authored Feb 15, 2022
  
  789bdbcd Browse Files
- 存量会员：代码优化 · d936e125
  xugaojun authored Feb 15, 2022
  
  d936e125 Browse Files
- 存量会员：新增登录用户参数、新增配置、匹配逻辑 · cbf6f281
  xugaojun authored Feb 15, 2022
  
  cbf6f281 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 5ae73d4c
  墨竹 authored Feb 15, 2022
  
  5ae73d4c Browse Files
- Merge branch 'feature-02-22' into developer · d935491c
  墨竹 authored Feb 15, 2022
  
  d935491c Browse Files
- feat：增加通知会员接口 · 3d020e67
  墨竹 authored Feb 15, 2022
  
  3d020e67 Browse Files
- 存量会员：修改企业查询接口 · 8df4ed63
  xugaojun authored Feb 15, 2022
  
  8df4ed63 Browse Files
14 Feb, 2022 8 commits

fix:组织架构加好友查询问题修复 · c5ca994b
xugaojun authored Feb 14, 2022

c5ca994b Browse Files
Merge branch 'bugfix-0214' into 'developer' · 6750b671
```
修复导购删除bug和导购重复bug

See merge request !167
```
yaosai authored Feb 14, 2022
6750b671 Browse Files

Merge branch 'developer' into 'bugfix-0214' · d0eeff3c

# Conflicts:
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffService.java
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
#   haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

authored Feb 14, 2022

d0eeff3c Browse Files

Merge branch 'bugfix-0214' into 'master' · 8c233bfe
```
修复导购删除bug和导购重复bug

See merge request !166
```
yaosai authored Feb 14, 2022
8c233bfe Browse Files
修复导购删除bug和导购重复bug · 148f6b10
yaosai authored Feb 14, 2022

148f6b10 Browse Files
Merge branch 'bugfix-0214' into 'developer' · 5c6bfe56
```
修复群发返回错误信息

See merge request !165
```
yaosai authored Feb 14, 2022
5c6bfe56 Browse Files

Merge branch 'developer' into 'bugfix-0214' · d35ac170

# Conflicts:
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffService.java
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

authored Feb 14, 2022

d35ac170 Browse Files

修复群发返回错误信息 · c4db91f6
yaosai authored Feb 14, 2022

c4db91f6 Browse Files