Commits · 6936e28ae6b2f69739d18df85dddc6ec1502c530 · 龚小红 / oto

15 Apr, 2022 3 commits
- 更新流程组的字段更新需求 · 6936e28a
  龚小红 authored Apr 15, 2022
  
  6936e28a
- Merge remote-tracking branch 'origin/master' into Feature/20220415-gxh · 48b7e62f
  龚小红 authored Apr 15, 2022
```
# Conflicts:
#	src/test/java/com/kjj/config/BasicConfig.java
```
  48b7e62f
- 更新流程组的字段更新需求 · 834ad523
  龚小红 authored Apr 15, 2022
  
  834ad523
11 Apr, 2022 4 commits
- Merge branch 'Feature/20220408-gxh' into 'master' · aaf7f86d
  龚小红 authored Apr 11, 2022
```
增加权限管理的相关用例

See merge request test-group/kejiji!244
```
  aaf7f86d
- 增加权限管理的相关用例 · 29d1090d
  龚小红 authored Apr 11, 2022
  
  29d1090d
- Merge branch 'Feature/20220408-gxh' into 'master' · 38aada84
  龚小红 authored Apr 11, 2022
```
增加权限管理的相关用例

See merge request test-group/kejiji!243
```
  38aada84
- 增加权限管理的相关用例 · 9e82d6ec
  龚小红 authored Apr 11, 2022
  
  9e82d6ec
08 Apr, 2022 7 commits
- Merge branch 'gifeature/2021110402-gj' into 'master' · 18cd41b0
  龚小红 authored Apr 08, 2022
```
Gifeature/2021110402 gj

See merge request test-group/kejiji!242
```
  18cd41b0
- 新建日程接口 · ea9457ec
  郭姣 authored Apr 08, 2022
  
  ea9457ec
- Merge remote-tracking branch 'origin/master' into gifeature/2021110402-gj · 85c28351
  郭姣 authored Apr 08, 2022
```
# Conflicts:
#	src/test/java/com/kjj/cases/otoseller/Work.java
```
  85c28351
- 新建日程接口 · 0d4731b4
  郭姣 authored Apr 08, 2022
  
  0d4731b4
- Merge branch 'Feature/20220408-gxh' into 'master' · cae7e4cf
  龚小红 authored Apr 08, 2022
```
增加权限管理的相关用例

See merge request test-group/kejiji!240
```
  cae7e4cf
- 增加权限管理的相关用例 · 63d06560
  龚小红 authored Apr 08, 2022
  
  63d06560
- 增加权限管理的相关用例 · 4011d4fa
  龚小红 authored Apr 08, 2022
  
  4011d4fa
25 Mar, 2022 2 commits
- Merge branch 'gifeature/20220322-gj' into 'master' · 9a2d4c9e
  龚小红 authored Mar 25, 2022
```
总监离职校验、销售间客户动态取消隔离

See merge request test-group/kejiji!239
```
  9a2d4c9e
- 总监离职校验、销售间客户动态取消隔离 · fdec9202
  郭姣 authored Mar 25, 2022
  
  fdec9202
22 Mar, 2022 2 commits
- Merge branch 'Feature/20220305-gxh' into 'master' · a6bbd0fe
  龚小红 authored Mar 22, 2022
```
Feature/20220305 gxh

See merge request test-group/kejiji!238
```
  a6bbd0fe
- `` · 3fa81a06
  龚小红 authored Mar 22, 2022
  
  3fa81a06
21 Mar, 2022 2 commits
- Merge branch 'Feature/20220305-gxh' into 'master' · f7aa86cf
  龚小红 authored Mar 21, 2022
```
增加生成otoCookie的方法

See merge request test-group/kejiji!237
```
  f7aa86cf
- Merge remote-tracking branch 'origin/master' into Feature/20220305-gxh · ca39005e
  龚小红 authored Mar 21, 2022
  
  ca39005e
16 Mar, 2022 1 commit
- 增加生成otoCookie的方法 · d6c46741
  龚小红 authored Mar 16, 2022
  
  d6c46741
11 Mar, 2022 2 commits
- Merge branch 'Feature/20220305-gxh' into 'master' · 14871378
  龚小红 authored Mar 11, 2022
```
删除总监不可修改为销售的用例，接口未做限制

See merge request test-group/kejiji!236
```
  14871378
- 删除总监不可修改为销售的用例，接口未做限制 · 6634942e
  龚小红 authored Mar 11, 2022
  
  6634942e
10 Mar, 2022 2 commits
- Merge branch 'Feature/20220305-gxh' into 'master' · b3b19acb
  龚小红 authored Mar 10, 2022
```
替换自动化角色手机号

See merge request test-group/kejiji!235
```
  b3b19acb
- 替换自动化角色手机号 · dec2e803
  龚小红 authored Mar 10, 2022
  
  dec2e803
09 Mar, 2022 2 commits
- Merge branch 'Feature/20220305-gxh' into 'master' · f2396b2a
  龚小红 authored Mar 09, 2022
```
fix

See merge request test-group/kejiji!234
```
  f2396b2a
- fix · 191b78a0
  龚小红 authored Mar 09, 2022
  
  191b78a0
08 Mar, 2022 6 commits
- Merge branch 'Feature/20220305-gxh' into 'master' · a0031bbc
  龚小红 authored Mar 08, 2022
```
fix---修复优惠券商品秒杀id错误

See merge request test-group/kejiji!233
```
  a0031bbc
- fix---修复优惠券商品秒杀id错误 · 43441d62
  龚小红 authored Mar 08, 2022
  
  43441d62
- Merge branch 'Feature/20220305-gxh' into 'master' · 72ce4cab
  龚小红 authored Mar 08, 2022
```
fix---修复优惠券商品秒杀id错误

See merge request test-group/kejiji!232
```
  72ce4cab
- fix---修复优惠券商品秒杀id错误 · 59b9071f
  龚小红 authored Mar 08, 2022
  
  59b9071f
- Merge branch 'Feature/20220305-gxh' into 'master' · 008b6c3c
  龚小红 authored Mar 08, 2022
```
fix

See merge request test-group/kejiji!231
```
  008b6c3c
- fix · 8b83730b
  龚小红 authored Mar 08, 2022
  
  8b83730b
07 Mar, 2022 4 commits
- Merge branch 'Feature/20220305-gxh' into 'master' · 4d3e870d
  龚小红 authored Mar 07, 2022
```
fix

See merge request test-group/kejiji!230
```
  4d3e870d
- fix · 57100bf6
  龚小红 authored Mar 07, 2022
  
  57100bf6
- Merge branch 'Feature/20220305-gxh' into 'master' · 485d503b
  龚小红 authored Mar 07, 2022
```
fix

See merge request test-group/kejiji!229
```
  485d503b
- fix · 8c4fe00d
  龚小红 authored Mar 07, 2022
  
  8c4fe00d
04 Mar, 2022 2 commits
- Merge branch 'Feature/20220305-gxh' into 'master' · ebd18137
  龚小红 authored Mar 04, 2022
```
增加管理后台销售、公司、权限、总监部分的数据

See merge request test-group/kejiji!228
```
  ebd18137
- 增加管理后台销售、公司、权限、总监部分的数据 · 584b5c09
  龚小红 authored Mar 04, 2022
  
  584b5c09
03 Mar, 2022 1 commit
- Merge branch 'Feature/20210222-gxh' into 'master' · a4be56d6
  龚小红 authored Mar 03, 2022
```
更换OTO自动化销售手机号

See merge request test-group/kejiji!227
```
  a4be56d6