Commits · e5f8552475838d612911d9e2208d3e77c10942d2 · haoban3.0 / haoban-manage3.0 · GitLab

07 Feb, 2023 9 commits
- Merge remote-tracking branch 'origin/developer-2023-02-15' into test_branch · e5f85524
  jinxin authored Feb 07, 2023
  
  e5f85524 Browse Files
- active_status字段删除 · 1a89265a
  jinxin authored Feb 07, 2023
  
  1a89265a Browse Files
- 去掉激活字段 · 6ad696ac
  徐高华 authored Feb 07, 2023
  
  6ad696ac Browse Files
- active_status字段删除 · 1dde46c9
  jinxin authored Feb 07, 2023
  
  1dde46c9 Browse Files
- Merge branch 'developer-2023-02-15' into test_branch · d015c0c8
  jinxin authored Feb 07, 2023
  
  d015c0c8 Browse Files
- 其他占用许可sql修改 · 77f7c838
  jinxin authored Feb 07, 2023
  
  77f7c838 Browse Files
- sql · ce472c74
  徐高华 authored Feb 07, 2023
  
  ce472c74 Browse Files
- 定时刷继承中的状态 · 3dc15b1d
  徐高华 authored Feb 07, 2023
  
  3dc15b1d Browse Files
- 转移群的状态定时处理 · 42b72490
  徐高华 authored Feb 07, 2023
  
  42b72490 Browse Files
06 Feb, 2023 15 commits
- Merge remote-tracking branch 'origin/developer-2023-02-15' into test_branch · 594977f3
  jinxin authored Feb 06, 2023
  
  594977f3 Browse Files
- test · e0f455fa
  jinxin authored Feb 06, 2023
  
  e0f455fa Browse Files
- 注释目标配置代码 · e1a5dbcd
  guojx authored Feb 06, 2023
  
  e1a5dbcd Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 79978aae
```
公用参数调整:多个门店同时查询的时候

See merge request !933
```
  guojx authored Feb 06, 2023
  79978aae Browse Files
- 公用参数调整:多个门店同时查询的时候 · 312bc131
  guojx authored Feb 06, 2023
  
  312bc131 Browse Files
- Merge remote-tracking branch 'origin/developer' into test_branch · 9de08755
  jinxin authored Feb 06, 2023
  
  9de08755 Browse Files
- 转移errorCode添加 · 46c767a4
  jinxin authored Feb 06, 2023
  
  46c767a4 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 79b98a8b
  徐高华 authored Feb 06, 2023
  
  79b98a8b Browse Files
- 加名称长度 · df7c11a9
  徐高华 authored Feb 06, 2023
  
  df7c11a9 Browse Files
- 转移errorCode添加 · ac345f2e
  jinxin authored Feb 06, 2023
  
  ac345f2e Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 6633d1aa
```
Feature 2023 01 目标配置

See merge request !932
```
  guojx authored Feb 06, 2023
  6633d1aa Browse Files
- 公用参数调整 · f03dc3d9
  guojx authored Feb 06, 2023
  
  f03dc3d9 Browse Files
- 目标跟进查询过滤已发布门店 · bf96ca61
  guojx authored Feb 06, 2023
  
  bf96ca61 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · cca84be2
  guojx authored Feb 06, 2023
  
  cca84be2 Browse Files
- 目标跟进查询过滤已发布门店 · f552dd6d
  guojx authored Feb 06, 2023
  
  f552dd6d Browse Files
03 Feb, 2023 16 commits
- Merge remote-tracking branch 'origin/developer' into test_branch · 7292619d
  jinxin authored Feb 03, 2023
  
  7292619d Browse Files
- update修改 · b6fc4991
  jinxin authored Feb 03, 2023
  
  b6fc4991 Browse Files
- Merge remote-tracking branch 'origin/developer' into test_branch · 96a1058c
  jinxin authored Feb 03, 2023
  
  96a1058c Browse Files
- sql修改 · bc92d3ac
  jinxin authored Feb 03, 2023
  
  bc92d3ac Browse Files
- Merge remote-tracking branch 'origin/developer' into test_branch · a2d16fde
  jinxin authored Feb 03, 2023
  
  a2d16fde Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 4864df17
  jinxin authored Feb 03, 2023
  
  4864df17 Browse Files
- 企业微信成功值修改 · b692644f
  jinxin authored Feb 03, 2023
  
  b692644f Browse Files
- Merge branch 'developer' into 'test_branch' · 6484e2ff
```
sql

See merge request !931
```
  徐高华 authored Feb 03, 2023
  6484e2ff Browse Files
- sql · 233ef61d
  徐高华 authored Feb 03, 2023
  
  233ef61d Browse Files
- Merge remote-tracking branch 'origin/developer' into test_branch · eb97e571
  jinxin authored Feb 03, 2023
  
  eb97e571 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 0f8b789b
  jinxin authored Feb 03, 2023
  
  0f8b789b Browse Files
- 判空处理 · 5e7005c0
  jinxin authored Feb 03, 2023
  
  5e7005c0 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 77e950ba
```
目标跟进门店会员631分层明细数据返回结构调整

See merge request !930
```
  guojx authored Feb 03, 2023
  77e950ba Browse Files
- 目标跟进门店会员631分层明细数据返回结构调整 · 684aa484
  guojx authored Feb 03, 2023
  
  684aa484 Browse Files
- 删除无效接口 · 17eda465
  徐高华 authored Feb 03, 2023
  
  17eda465 Browse Files
- Merge remote-tracking branch 'origin/developer' into test_branch · 14e8afcf
```
# Conflicts:
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  jinxin authored Feb 03, 2023
  14e8afcf Browse Files