Commits · 08ad065a52f2852cddcb5e04a10f5bf93b62b729 · haoban3.0 / haoban-manage3.0 · GitLab

11 Aug, 2022 6 commits
- 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 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 2 commits
- fix：删除商户停用代码 · a16078e8
  墨竹 authored Aug 09, 2022
  
  a16078e8 Browse Files
- fix：增加空判断 · 84e02c91
  墨竹 authored Aug 09, 2022
  
  84e02c91 Browse Files
08 Aug, 2022 17 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