Commits · 4ee059581bf8cc12864f81d3c5521761b60d2e3d · haoban3.0 / haoban-manage3.0

10 Aug, 2022 1 commit

Merge branch 'developer' into feature-qywx-fee · 4ee05958

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseMapper.java
#	haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

authored Aug 10, 2022

4ee05958 Browse Files

09 Aug, 2022 2 commits
- fix：删除商户停用代码 · a16078e8
  墨竹 authored Aug 09, 2022
  
  a16078e8 Browse Files
- fix：增加空判断 · 84e02c91
  墨竹 authored Aug 09, 2022
  
  84e02c91 Browse Files
08 Aug, 2022 25 commits
- fix：活码日志 · 46987348
  墨竹 authored Aug 09, 2022
  
  46987348 Browse Files
- fix：活码日志 · d82f388a
  墨竹 authored Aug 09, 2022
  
  d82f388a Browse Files
- fix：删除无效代码 · ff289e73
  墨竹 authored Aug 09, 2022
  
  ff289e73 Browse Files
- Merge branch 'developer' into 'master' · e10a78ca
```
Developer

See merge request !203
```
  徐高华 authored Aug 09, 2022
  e10a78ca Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · e3253862
  徐高华 authored Aug 09, 2022
  
  e3253862 Browse Files
- 非空判断 · 25400521
  徐高华 authored Aug 09, 2022
  
  25400521 Browse Files
- Merge branch 'master' into developer · cb424cb1
  墨竹 authored Aug 09, 2022
  
  cb424cb1 Browse Files
- fix：员工更新 · e56c646d
  墨竹 authored Aug 09, 2022
  
  e56c646d Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 7e4179c0
  墨竹 authored Aug 09, 2022
  
  7e4179c0 Browse Files
- fix：查询客户修改 · 5ff0b0ec
  墨竹 authored Aug 09, 2022
  
  5ff0b0ec Browse Files
- fix：活码定时任务修改 · f28ad3d2
  墨竹 authored Aug 09, 2022
  
  f28ad3d2 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 788b1d58
  徐高华 authored Aug 09, 2022
  
  788b1d58 Browse Files
- test · 1c3abe44
  徐高华 authored Aug 09, 2022
  
  1c3abe44 Browse Files
- fix：增加定时任务 · f8bf5610
  墨竹 authored Aug 08, 2022
  
  f8bf5610 Browse Files
- fix：增加查询条件 · 31a61f94
  墨竹 authored Aug 08, 2022
  
  31a61f94 Browse Files
- fix：查询所有企业修改 · dc5e996b
  墨竹 authored Aug 08, 2022
  
  dc5e996b Browse Files
- Merge branch 'developer' into 'master' · 502dc0c7
```
Developer

See merge request !202
```
  徐高华 authored Aug 08, 2022
  502dc0c7 Browse Files
- api限制300/s · 95eb70cb
  徐高华 authored Aug 08, 2022
  
  95eb70cb Browse Files
- 伪登录 · b9cb0ba6
  徐高华 authored Aug 08, 2022
  
  b9cb0ba6 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · 59827a7f
  墨竹 authored Aug 08, 2022
  
  59827a7f Browse Files
- fix：企微收费修改 · c1801f2b
  墨竹 authored Aug 08, 2022
  
  c1801f2b Browse Files
- Merge branch 'developer' into feature-qywx-fee · aa925a7c
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseMapper.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseService.java
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
#	haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml
```
  墨竹 authored Aug 08, 2022
  aa925a7c Browse Files
- fix：联系我定时任务，判断是否有权限 · 250deac0
  墨竹 authored Aug 08, 2022
  
  250deac0 Browse Files
- Merge branch 'developer' into 'master' · 1594f743
```
Developer

See merge request !201
```
  徐高华 authored Aug 08, 2022
  1594f743 Browse Files
- 删除商户停用的代码 · 8403edf3
  徐高华 authored Aug 08, 2022
  
  8403edf3 Browse Files
05 Aug, 2022 11 commits
- fix：迁移多人活码api · 7e01269e
  墨竹 authored Aug 05, 2022
  
  7e01269e Browse Files
- fix：日志 · 54a4b13c
  墨竹 authored Aug 05, 2022
  
  54a4b13c Browse Files
- feat：企微收费列表接口 · 74b96f1d
  墨竹 authored Aug 05, 2022
  
  74b96f1d Browse Files
- feat：企微收费列表接口 · 627291cb
  墨竹 authored Aug 05, 2022
  
  627291cb Browse Files
- Merge branch 'feature-0808' into developer · aff7100e
  songyinghui authored Aug 05, 2022
  
  aff7100e Browse Files
- feat: 欢迎语上限提示 · c1b24dcf
  songyinghui authored Aug 05, 2022
  
  c1b24dcf Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 89551f24
  songyinghui authored Aug 05, 2022
  
  89551f24 Browse Files
- Merge branch 'feature-0808' into developer · 6a891586
  songyinghui authored Aug 05, 2022
  
  6a891586 Browse Files
- feat: 欢迎语上限提示 · 3efb4651
  songyinghui authored Aug 05, 2022
  
  3efb4651 Browse Files
- feat：binlog日志 · eff9f431
  墨竹 authored Aug 05, 2022
  
  eff9f431 Browse Files
- feat：收费 · 043a987f
  墨竹 authored Aug 05, 2022
  
  043a987f Browse Files
04 Aug, 2022 1 commit
- Merge remote-tracking branch 'origin/developer' into developer · 7a596b5f
  墨竹 authored Aug 04, 2022
  
  7a596b5f Browse Files