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

02 Feb, 2023 40 commits
- 其他占用许可总数sql修改 · f26cdb41
  jinxin authored Feb 02, 2023
  
  f26cdb41 Browse Files
- 通讯录成员转移接口开发 · e0821eee
  jinxin authored Feb 02, 2023
  
  e0821eee Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 1f55132a
  jinxin authored Feb 02, 2023
  
  1f55132a Browse Files
- 通讯录成员转移接口开发 · d5a70cea
  jinxin authored Feb 02, 2023
  
  d5a70cea Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 40fc96e7
  徐高华 authored Feb 02, 2023
  
  40fc96e7 Browse Files
- sql · f6c0ddf2
  徐高华 authored Feb 02, 2023
  
  f6c0ddf2 Browse Files
- 通讯录成员转移接口开发 · cd2c72bb
  jinxin authored Feb 02, 2023
  
  cd2c72bb Browse Files
- sql · 44728780
  徐高华 authored Feb 02, 2023
  
  44728780 Browse Files
- sql · 3e043139
  徐高华 authored Feb 02, 2023
  
  3e043139 Browse Files
- sql · da5b1346
  徐高华 authored Feb 02, 2023
  
  da5b1346 Browse Files
- 激活码 · aa968e85
  徐高华 authored Feb 02, 2023
  
  aa968e85 Browse Files
- 激活码查询 · 6654f034
  徐高华 authored Feb 02, 2023
  
  6654f034 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_0202' into developer · 70f108dd
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java
```
  徐高华 authored Feb 02, 2023
  70f108dd Browse Files
- api · b2a58df1
  徐高华 authored Feb 02, 2023
  
  b2a58df1 Browse Files
- 朋友圈 · e02f8168
  徐高华 authored Feb 02, 2023
  
  e02f8168 Browse Files
- 通讯录接口开发 · 5817fb4d
  jinxin authored Feb 02, 2023
  
  5817fb4d Browse Files
- Merge remote-tracking branch 'origin/feature/好办通讯录' into developer · e9972faa
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseActiveDataServiceImpl.java
```
  jinxin authored Feb 02, 2023
  e9972faa Browse Files
- 通讯录接口开发 · 37c75c2f
  jinxin authored Feb 02, 2023
  
  37c75c2f Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 3cc1a48e
  徐高华 authored Feb 02, 2023
  
  3cc1a48e Browse Files
- 激活统计 · 03955ad1
  徐高华 authored Feb 02, 2023
  
  03955ad1 Browse Files
- Merge remote-tracking branch 'origin/feature/好办通讯录' into developer · 2f4439c4
  jinxin authored Feb 02, 2023
  
  2f4439c4 Browse Files
- staff表字段添加 · a835cfdc
  jinxin authored Feb 02, 2023
  
  a835cfdc Browse Files
- 激活码统计 · 9065bb9c
  徐高华 authored Feb 02, 2023
  
  9065bb9c Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 1bca6e3c
```
目标跟进：门店明细接口调整

See merge request !924
```
  guojx authored Feb 02, 2023
  1bca6e3c Browse Files
- 目标跟进：门店明细接口调整 · fb1ddea7
  guojx authored Feb 02, 2023
  
  fb1ddea7 Browse Files
- Merge branch 'feature/好办通讯录' into developer · 48054759
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderAccountMapper.java
```
  jinxin authored Feb 02, 2023
  48054759 Browse Files
- 通讯录接口开发 · dc4b5524
  jinxin authored Feb 02, 2023
  
  dc4b5524 Browse Files
- 通讯录接口开发 · ceb42c4a
  jinxin authored Feb 02, 2023
  
  ceb42c4a Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 1071a2c7
```
目标跟进接口修复

See merge request !923
```
  guojx authored Feb 02, 2023
  1071a2c7 Browse Files
- 目标跟进接口修复 · b0b091d8
  guojx authored Feb 02, 2023
  
  b0b091d8 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 91ab6407
```
Feature 2023 01 目标配置

See merge request !922
```
  guojx authored Feb 02, 2023
  91ab6407 Browse Files
- 目标跟进接口修复 · 5226a7f0
  guojx authored Feb 02, 2023
  
  5226a7f0 Browse Files
- 目标跟进接口修复 · 81bf00ba
  guojx authored Feb 02, 2023
  
  81bf00ba Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · a8317f87
```
目标跟进接口修复

See merge request !921
```
  guojx authored Feb 02, 2023
  a8317f87 Browse Files
- 目标跟进接口修复 · d0e26ada
  guojx authored Feb 02, 2023
  
  d0e26ada Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 58d5ad73
```
目标跟进接口修复

See merge request !920
```
  guojx authored Feb 02, 2023
  58d5ad73 Browse Files
- 目标跟进接口修复 · 2810c9c3
  guojx authored Feb 02, 2023
  
  2810c9c3 Browse Files
- Merge branch 'feature-2023-01-目标配置' into developer · 194af409
```
# Conflicts:
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  guojx authored Feb 02, 2023
  194af409 Browse Files
- 目标跟进接口修复 · 673f609d
  guojx authored Feb 02, 2023
  
  673f609d Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · ee066052
```
Feature 2023 01 目标配置

See merge request !918
```
  guojx authored Feb 02, 2023
  ee066052 Browse Files