Commits · 6750b6719f3a6ee411b81061c426e4cb52546776 · haoban3.0 / haoban-manage3.0

14 Feb, 2022 8 commits

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

修复导购删除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
鸿星尔克定制需求：增加企业校验 · aee12114
xugaojun authored Feb 14, 2022

aee12114 Browse Files
添加参数校验 · cd736752
xugaojun authored Feb 14, 2022

cd736752 Browse Files

11 Feb, 2022 20 commits
- fix:添加使用范围默认值 · 22137720
  xugaojun authored Feb 11, 2022
  
  22137720 Browse Files
- fix:修改字段名 · f51eca1a
  xugaojun authored Feb 11, 2022
  
  f51eca1a Browse Files
- fix:添加新增idsql · ef9e2e56
  xugaojun authored Feb 11, 2022
  
  ef9e2e56 Browse Files
- fix:修复一个新增Bug · 6dd87d1f
  xugaojun authored Feb 11, 2022
  
  6dd87d1f Browse Files
- fix:修复一个新增Bug · fab1db1b
  xugaojun authored Feb 11, 2022
  
  fab1db1b Browse Files
- fix:修复一个新增Bug · 1274d330
  xugaojun authored Feb 11, 2022
  
  1274d330 Browse Files
- fix:修复一个新增Bug · 07ae8234
  xugaojun authored Feb 11, 2022
  
  07ae8234 Browse Files
- fix:修复一个新增Bug · 36f1bf2a
  xugaojun authored Feb 11, 2022
  
  36f1bf2a Browse Files
- fix:修复sql · 630eee00
  xugaojun authored Feb 11, 2022
  
  630eee00 Browse Files
- Merge branch 'feature-02-22' into developer · e2e5ed74
  xugaojun authored Feb 11, 2022
  
  e2e5ed74 Browse Files
- 包路径 · a1f61e2a
  xugaojun authored Feb 11, 2022
  
  a1f61e2a Browse Files
- api实现，dubbo配置 · fe893c03
  xugaojun authored Feb 11, 2022
  
  fe893c03 Browse Files
- Merge remote-tracking branch 'origin/feature-02-22' into feature-02-22 · b5a60ccf
  xugaojun authored Feb 11, 2022
  
  b5a60ccf Browse Files
- 包路径优化、提供api接口、代码优化、提供批量操作接口 · 0560ebc2
  xugaojun authored Feb 11, 2022
  
  0560ebc2 Browse Files
- Merge branch 'feature-02-22' into developer · a25db3a4
  墨竹 authored Feb 11, 2022
  
  a25db3a4 Browse Files
- Merge remote-tracking branch 'origin/feature-02-22' into feature-02-22 · ea811f2d
  墨竹 authored Feb 11, 2022
  
  ea811f2d Browse Files
- feat：会员加好友返回修改 · e40121d0
  墨竹 authored Feb 11, 2022
  
  e40121d0 Browse Files
- Merge branch 'master' into developer · 18670f53
  墨竹 authored Feb 11, 2022
  
  18670f53 Browse Files
- feat：判断手机号为空，直接返回 · fbedf0c7
  墨竹 authored Feb 11, 2022
  
  fbedf0c7 Browse Files
- 欢迎语适用范围，代码优化、模型优化 · e6706209
  xugaojun authored Feb 11, 2022
  
  e6706209 Browse Files
10 Feb, 2022 12 commits
- Merge remote-tracking branch 'origin/developer' into developer · 5ab9f1c7
  墨竹 authored Feb 10, 2022
  
  5ab9f1c7 Browse Files
- 修改suitId · 96e8476d
  xugaojun authored Feb 10, 2022
  
  96e8476d Browse Files
- 修改suitId · 022e7041
  xugaojun authored Feb 10, 2022
  
  022e7041 Browse Files
- feat：好办欢迎语修改 · 1a3dd770
  墨竹 authored Feb 10, 2022
  
  1a3dd770 Browse Files
- feat：好办欢迎语修改 · 13980bf0
  墨竹 authored Feb 10, 2022
  
  13980bf0 Browse Files
- Merge branch 'bugfix-20220210' into 'developer' · d4abe264
```
Bugfix 20220210

See merge request !163
```
  yaosai authored Feb 10, 2022
  d4abe264 Browse Files
- bugfix-删除导购逻辑调整 · 365cbd31
  yaosai authored Feb 10, 2022
  
  365cbd31 Browse Files
- bugfix-删除导购逻辑调整 · dd98bb52
  yaosai authored Feb 10, 2022
  
  dd98bb52 Browse Files
- bugfix-删除导购逻辑调整 · adbccc8d
  yaosai authored Feb 10, 2022
  
  adbccc8d Browse Files
- Merge remote-tracking branch 'origin/feature-02-22' into feature-02-22 · 8c543db7
  xugaojun authored Feb 10, 2022
  
  8c543db7 Browse Files
- 代码优化、新增字段 · 2c9d0e6b
  xugaojun authored Feb 10, 2022
  
  2c9d0e6b Browse Files
- fix:好办好友关系解除后，通知会员 · e2a23cb0
  墨竹 authored Feb 10, 2022
  
  e2a23cb0 Browse Files