Commits · 55971cbf409ff5ceb14d8989212b0e019f7fc43d · haoban3.0 / haoban-manage3.0 · GitLab

11 Aug, 2022 24 commits
- 返回corpid · 55971cbf
  徐高华 authored Aug 11, 2022
  
  55971cbf Browse Files
- 微信 · f40c0d39
  徐高华 authored Aug 11, 2022
  
  f40c0d39 Browse Files
- 返回微信corpid · 27eb9146
  徐高华 authored Aug 11, 2022
  
  27eb9146 Browse Files
- sql or 加（） · 09a6f1d0
  徐高华 authored Aug 11, 2022
  
  09a6f1d0 Browse Files
- sql参数错误 · f7062776
  徐高华 authored Aug 11, 2022
  
  f7062776 Browse Files
- fix：数量修改 · e04f07f9
  墨竹 authored Aug 11, 2022
  
  e04f07f9 Browse Files
- fix：报错 · 267b127b
  墨竹 authored Aug 11, 2022
  
  267b127b Browse Files
- fix：收费改为消息队列 · cc0b6cad
  墨竹 authored Aug 11, 2022
  
  cc0b6cad Browse Files
- fix：收费改为消息队列 · ac5c2a54
  墨竹 authored Aug 11, 2022
  
  ac5c2a54 Browse Files
- fix：错误 · 723e82ff
  墨竹 authored Aug 11, 2022
  
  723e82ff Browse Files
- fix：test · f9d23e69
  墨竹 authored Aug 11, 2022
  
  f9d23e69 Browse Files
- Merge branch 'feature-qywx-fee' into developer · c58f2b44
  墨竹 authored Aug 11, 2022
  
  c58f2b44 Browse Files
- fix：test · 33b09f1e
  墨竹 authored Aug 11, 2022
  
  33b09f1e Browse Files
- fix：test · 487b6686
  墨竹 authored Aug 11, 2022
  
  487b6686 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 91dafa71
  墨竹 authored Aug 11, 2022
  
  91dafa71 Browse Files
- Merge branch 'feature-qywx-fee' into developer · 08ad065a
  墨竹 authored Aug 11, 2022
  
  08ad065a Browse Files
- fix：收费增加告警 · 98ae99a3
  墨竹 authored Aug 11, 2022
  
  98ae99a3 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_企微安全升级' into developer · c441d979
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterprise.java
	haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml
```
  徐高华 authored Aug 11, 2022
  c441d979 Browse Files
- 删除corpid · cb8f77b7
  徐高华 authored Aug 11, 2022
  
  cb8f77b7 Browse Files
- 好办安全升级调整 · 7a2e471d
  徐高华 authored Aug 11, 2022
  
  7a2e471d Browse Files
- Merge branch 'master' into developer · f519f21a
  墨竹 authored Aug 11, 2022
  
  f519f21a Browse Files
- fix：不使用我们生成的活码 · 35c315dd
  墨竹 authored Aug 11, 2022
  
  35c315dd Browse Files
- Merge branch 'master' into developer · c85d3bed
  墨竹 authored Aug 11, 2022
  
  c85d3bed Browse Files
- fix：活码字段插入 · 416dfb3a
  墨竹 authored Aug 11, 2022
  
  416dfb3a Browse Files
10 Aug, 2022 15 commits
- fix：企微收费弹窗 · eb88813a
  墨竹 authored Aug 10, 2022
  
  eb88813a Browse Files
- fix：收费列表 · 2cef0292
  墨竹 authored Aug 10, 2022
  
  2cef0292 Browse Files
- fix：收费列表 · 83d910ed
  墨竹 authored Aug 10, 2022
  
  83d910ed Browse Files
- fix：收费列表 · 136d8569
  墨竹 authored Aug 10, 2022
  
  136d8569 Browse Files
- Merge branch 'master' into developer · ede0f27d
  墨竹 authored Aug 10, 2022
  
  ede0f27d Browse Files
- fix：不用我们的活码兼容 · 3965c206
  墨竹 authored Aug 10, 2022
  
  3965c206 Browse Files
- fix：企微收费 · 78d31337
  墨竹 authored Aug 10, 2022
  
  78d31337 Browse Files
- Merge branch 'feature-qywx-fee' into developer · 7d3b683b
  墨竹 authored Aug 10, 2022
  
  7d3b683b Browse Files
- fix：拦截日志 · e2285b96
  墨竹 authored Aug 10, 2022
  
  e2285b96 Browse Files
- Merge branch 'feature-qywx-fee' into developer · 5623230d
  墨竹 authored Aug 10, 2022
  
  5623230d Browse Files
- fix：拦截日志 · 7f9cfeb1
  墨竹 authored Aug 10, 2022
  
  7f9cfeb1 Browse Files
- Merge branch 'feature-2022-08-base' into 'developer' · b1c0909a
```
好办日志调整

See merge request !204
```
  guojx authored Aug 10, 2022
  b1c0909a Browse Files
- 好办日志调整 · 7975466b
  guojx authored Aug 10, 2022
  
  7975466b Browse Files
- fix：删除无效代码 · 12e32a7e
  墨竹 authored Aug 10, 2022
  
  12e32a7e Browse Files
- 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 1 commit
- fix：删除商户停用代码 · a16078e8
  墨竹 authored Aug 09, 2022
  
  a16078e8 Browse Files