Commits · 58f11e5c1c8646eee29ec3c5b9fc85d46af153ef · haoban3.0 / haoban-manage3.0 · GitLab

11 Apr, 2023 2 commits
- Merge remote-tracking branch 'origin/bugfix/2023-04-11' into developer · 58f11e5c
  jinxin authored Apr 11, 2023
  
  58f11e5c Browse Files
- 导出部门字段为null问题处理 · bd16c618
  jinxin authored Apr 11, 2023
  
  bd16c618 Browse Files
10 Apr, 2023 38 commits
- Merge branch 'feature/企微许可账号购买' into 'developer' · 5c308b3d
```
非空判断

See merge request !1117
```
  徐高华 authored Apr 10, 2023
  5c308b3d Browse Files
- Merge branch 'feature/企微许可账号购买' into 'master' · 3afa18e5
```
非空判断

See merge request !1116
```
  徐高华 authored Apr 10, 2023
  3afa18e5 Browse Files
- 非空判断 · c9c48cfe
  徐高华 authored Apr 10, 2023
  
  c9c48cfe Browse Files
- Merge branch 'feature-content2' into developer · e72d939f
  songyinghui authored Apr 10, 2023
  
  e72d939f Browse Files
- feat: 订单延迟消费 · 05659954
  songyinghui authored Apr 10, 2023
  
  05659954 Browse Files
- Merge branch 'feature-content2' into developer · caa0871f
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageCategoryTypeEnum.java
```
  songyinghui authored Apr 10, 2023
  caa0871f Browse Files
- feat: 订单延迟消费 · af017ea2
  songyinghui authored Apr 10, 2023
  
  af017ea2 Browse Files
- Merge branch 'feature-content2' into developer · 1fc582b5
  songyinghui authored Apr 10, 2023
  
  1fc582b5 Browse Files
- feat: 周报定时任务 · 89c34cec
  songyinghui authored Apr 10, 2023
  
  89c34cec Browse Files
- Merge branch 'feature/企微许可账号购买' into 'master' · 443381c8
```
Feature/企微许可账号购买

See merge request !1113
```
  徐高华 authored Apr 10, 2023
  443381c8 Browse Files
- Merge branch 'bugfix/2023-04-10' into 'master' · 2f8335a5
```
把qrcode中http替换为https

See merge request !1112
```
  徐高华 authored Apr 10, 2023
  2f8335a5 Browse Files
- Merge branch 'feature-content2' into developer · 94d07b57
  songyinghui authored Apr 10, 2023
  
  94d07b57 Browse Files
- feat: 中转页跳转 · 113ec359
  songyinghui authored Apr 10, 2023
  
  113ec359 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ac91ca68
  jinxin authored Apr 10, 2023
  
  ac91ca68 Browse Files
- Merge remote-tracking branch 'origin/feature/企微许可账号购买' into developer · 43b7e4cd
  jinxin authored Apr 10, 2023
  
  43b7e4cd Browse Files
- 是否显示弹窗 · 29a333ab
  jinxin authored Apr 10, 2023
  
  29a333ab Browse Files
- Merge branch 'master_欢迎语调整' into 'developer' · 5722b718
```
欢迎语

See merge request !1111
```
  徐高华 authored Apr 10, 2023
  5722b718 Browse Files
- 欢迎语 · d5cf96a6
  徐高华 authored Apr 10, 2023
  
  d5cf96a6 Browse Files
- Merge remote-tracking branch 'origin/feature/企微许可账号购买' into developer · c16d369b
  jinxin authored Apr 10, 2023
  
  c16d369b Browse Files
- 是否显示弹窗 · 06ca9274
  jinxin authored Apr 10, 2023
  
  06ca9274 Browse Files
- Merge branch 'feature-content2' into developer · 3e72484a
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/MaterialDataAdaptor.java
```
  songyinghui authored Apr 10, 2023
  3e72484a Browse Files
- feat: 数据转换 · 19e4f622
  songyinghui authored Apr 10, 2023
  
  19e4f622 Browse Files
- feat: 数据转换 · 995336dd
  songyinghui authored Apr 10, 2023
  
  995336dd Browse Files
- feat: 文件模板 · d9798019
  songyinghui authored Apr 10, 2023
  
  d9798019 Browse Files
- feat: 文件模板 · 67b35db6
  songyinghui authored Apr 10, 2023
  
  67b35db6 Browse Files
- Merge branch 'feature-content2' into developer · 85dbb048
  songyinghui authored Apr 10, 2023
  
  85dbb048 Browse Files
- feat: 素材使用数据 · 3b2c5f4b
  songyinghui authored Apr 10, 2023
  
  3b2c5f4b Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · 0f25e2c0
  songyinghui authored Apr 10, 2023
  
  0f25e2c0 Browse Files
- Merge branch 'feature-content2' into developer · 9cd24d73
  songyinghui authored Apr 10, 2023
  
  9cd24d73 Browse Files
- feat: 周报参数 · bb36ea34
  songyinghui authored Apr 10, 2023
  
  bb36ea34 Browse Files
- feat: 周报参数 · f576d4ea
  songyinghui authored Apr 10, 2023
  
  f576d4ea Browse Files
- feat: 月报周期 · 19318ef6
  songyinghui authored Apr 10, 2023
  
  19318ef6 Browse Files
- feat: 月报周期 · 6a60e4bd
  songyinghui authored Apr 10, 2023
  
  6a60e4bd Browse Files
- feat: 周报事件 · a6f60719
  songyinghui authored Apr 10, 2023
  
  a6f60719 Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-04-10' into developer · 4c3a9921
```
# Conflicts:
#	haoban-manage3-service/src/test/java/DealSyncTest.java
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
```
  jinxin authored Apr 10, 2023
  4c3a9921 Browse Files
- 把qrcode中http替换为https · 7c36bdf1
  jinxin authored Apr 10, 2023
  
  7c36bdf1 Browse Files
- Merge branch 'master_欢迎语调整' into 'developer' · 0813ef84
```
更新状态

See merge request !1110
```
  徐高华 authored Apr 10, 2023
  0813ef84 Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · 322c67f8
  songyinghui authored Apr 10, 2023
  
  322c67f8 Browse Files