Commits · 3ae5bdca16f2222d87ac0ec0eedf6c43e17dba8a · haoban3.0 / haoban-manage3.0 · GitLab

13 Jul, 2022 14 commits
- sql · 3ae5bdca
  徐高华 authored Jul 13, 2022
  
  3ae5bdca Browse Files
- Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer · 690a6cd9
```
Conflicts:
	haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
```
  徐高华 authored Jul 13, 2022
  690a6cd9 Browse Files
- sql · ed3211ef
  徐高华 authored Jul 13, 2022
  
  ed3211ef Browse Files
- Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer · f2f7c026
```
Conflicts:
	haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
```
  徐高华 authored Jul 13, 2022
  f2f7c026 Browse Files
- 商户停用 · ac8e1639
  徐高华 authored Jul 13, 2022
  
  ac8e1639 Browse Files
- Merge branch 'master_xgh_停用功能' into 'developer' · dd3995c2
```
停用主门店

See merge request !188
```
  徐高华 authored Jul 13, 2022
  dd3995c2 Browse Files
- Merge branch 'feature_0711' into developer · aed2771a
  墨竹 authored Jul 13, 2022
  
  aed2771a Browse Files
- feat:登录修改 · 0f01104d
  墨竹 authored Jul 13, 2022
  
  0f01104d Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 3af4c9cb
  墨竹 authored Jul 13, 2022
  
  3af4c9cb Browse Files
- feat:请求数据组参数和返参 · 11491e2b
  墨竹 authored Jul 13, 2022
  
  11491e2b Browse Files
- feat: 关联欢迎语统一方法 · 34984a5f
  songyinghui authored Jul 13, 2022
  
  34984a5f Browse Files
- 停用主门店 · 1987bab9
  徐高华 authored Jul 13, 2022
  
  1987bab9 Browse Files
- feat: 新建欢迎语时不关联欢迎语时 · 42cd5437
  songyinghui authored Jul 13, 2022
  
  42cd5437 Browse Files
- feat:导购门店转移 · 71fa2870
  墨竹 authored Jul 13, 2022
  
  71fa2870 Browse Files
12 Jul, 2022 26 commits
- Merge branch 'master_xgh_停用功能' into 'developer' · 326fabdc
```
商户停用

See merge request !187
```
  徐高华 authored Jul 12, 2022
  326fabdc Browse Files
- 商户停用 · bba94ca4
  徐高华 authored Jul 12, 2022
  
  bba94ca4 Browse Files
- Merge branch 'master_xgh_停用功能' into 'developer' · f1a7479c
```
log

See merge request !186
```
  徐高华 authored Jul 12, 2022
  f1a7479c Browse Files
- log · 327d9047
  徐高华 authored Jul 12, 2022
  
  327d9047 Browse Files
- Merge branch 'master_xgh_停用功能' into 'developer' · 3191c752
```
test

See merge request !185
```
  徐高华 authored Jul 12, 2022
  3191c752 Browse Files
- test · 7033f48f
  徐高华 authored Jul 12, 2022
  
  7033f48f Browse Files
- Merge branch 'master_xgh_停用功能' into 'developer' · 02891217
```
log

See merge request !184
```
  徐高华 authored Jul 12, 2022
  02891217 Browse Files
- log · 2f30b6f3
  徐高华 authored Jul 12, 2022
  
  2f30b6f3 Browse Files
- Merge branch 'master_xgh_停用功能' into 'developer' · 7b2ba3f2
```
商户停用

See merge request !183
```
  徐高华 authored Jul 12, 2022
  7b2ba3f2 Browse Files
- 商户停用 · e6ec98a1
  徐高华 authored Jul 12, 2022
  
  e6ec98a1 Browse Files
- feat: 活码分组模糊检索 · f787464d
  songyinghui authored Jul 12, 2022
  
  f787464d Browse Files
- feat: 操作日志 · 3b2b28b6
  songyinghui authored Jul 12, 2022
  
  3b2b28b6 Browse Files
- feat:修改返回活码数量接口 · ebb361fc
  墨竹 authored Jul 12, 2022
  
  ebb361fc Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 634af29a
  墨竹 authored Jul 12, 2022
  
  634af29a Browse Files
- feat:添加好友增加日志 · 9363846d
  墨竹 authored Jul 12, 2022
  
  9363846d Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · ccb99b38
  徐高华 authored Jul 12, 2022
  
  ccb99b38 Browse Files
- feat: 移除无用的类 · 7a88bfe5
  songyinghui authored Jul 12, 2022
  
  7a88bfe5 Browse Files
- feat: 列表 page 对象格式调整 · eb953d46
  songyinghui authored Jul 12, 2022
  
  eb953d46 Browse Files
- sql · 3bd57fb1
  徐高华 authored Jul 12, 2022
  
  3bd57fb1 Browse Files
- feat: 移除落地页关联表 · def39d93
  songyinghui authored Jul 12, 2022
  
  def39d93 Browse Files
- page · d8d08512
  徐高华 authored Jul 12, 2022
  
  d8d08512 Browse Files
- 放开注释 · 9347d353
  徐高华 authored Jul 12, 2022
  
  9347d353 Browse Files
- test · 27ee008a
  徐高华 authored Jul 12, 2022
  
  27ee008a Browse Files
- 日志 · 70280d53
  徐高华 authored Jul 12, 2022
  
  70280d53 Browse Files
- bo · 4100dc38
  徐高华 authored Jul 12, 2022
  
  4100dc38 Browse Files
- 活码 · 3fe6cda8
  徐高华 authored Jul 12, 2022
  
  3fe6cda8 Browse Files