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

11 Apr, 2023 29 commits
- Merge branch 'feature-content2' into developer · a0f94d8c
  songyinghui authored Apr 11, 2023
  
  a0f94d8c Browse Files
- feat: 感觉是否开启高级版调整 · 51c436c6
  songyinghui authored Apr 11, 2023
  
  51c436c6 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 2d61cd8a
```
test

See merge request !1121
```
  徐高华 authored Apr 11, 2023
  2d61cd8a Browse Files
- test · 6567ba2b
  徐高华 authored Apr 11, 2023
  
  6567ba2b Browse Files
- Merge branch 'feature-content2' into developer · b821d0c2
  songyinghui authored Apr 11, 2023
  
  b821d0c2 Browse Files
- feat: 权限初始化 · 54ff1e59
  songyinghui authored Apr 11, 2023
  
  54ff1e59 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 611c83e3
```
test

See merge request !1120
```
  徐高华 authored Apr 11, 2023
  611c83e3 Browse Files
- test · 8ebd92f4
  徐高华 authored Apr 11, 2023
  
  8ebd92f4 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 55d7279c
```
test

See merge request !1118
```
  徐高华 authored Apr 11, 2023
  55d7279c Browse Files
- test · b6a1d8cb
  徐高华 authored Apr 11, 2023
  
  b6a1d8cb Browse Files
- Merge branch 'feature-content2' into developer · 66dcfbc7
  songyinghui authored Apr 11, 2023
  
  66dcfbc7 Browse Files
- feat: 排序 · e5626c08
  songyinghui authored Apr 11, 2023
  
  e5626c08 Browse Files
- feat: 周报月报使用高级版 · d238b091
  songyinghui authored Apr 11, 2023
  
  d238b091 Browse Files
- Merge branch 'feature-content2' into developer · 70cd71ae
  songyinghui authored Apr 11, 2023
  
  70cd71ae Browse Files
- feat: 数据统计 · c35f42bf
  songyinghui authored Apr 11, 2023
  
  c35f42bf Browse Files
- Merge branch 'feature-content2' into developer · 3b736d86
  songyinghui authored Apr 11, 2023
  
  3b736d86 Browse Files
- feat: 销售线索图片 · ef7e3156
  songyinghui authored Apr 11, 2023
  
  ef7e3156 Browse Files
- Merge branch 'feature-content2' into developer · a1b14cce
  songyinghui authored Apr 11, 2023
  
  a1b14cce Browse Files
- feat: 好友关系筛选 · e818bb05
  songyinghui authored Apr 11, 2023
  
  e818bb05 Browse Files
- feat: 好友关系筛选 · 806e0c18
  songyinghui authored Apr 11, 2023
  
  806e0c18 Browse Files
- Merge branch 'feature-content2' into developer · 7a18483c
  songyinghui authored Apr 11, 2023
  
  7a18483c Browse Files
- feat: 好友关系判定 · 90081041
  songyinghui authored Apr 11, 2023
  
  90081041 Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-04-11' into developer · 04c1f625
  jinxin authored Apr 11, 2023
  
  04c1f625 Browse Files
- 好办小程序菜单权限bug修复 · ec127aff
  jinxin authored Apr 11, 2023
  
  ec127aff Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-04-11' into developer · 3f6b045a
  jinxin authored Apr 11, 2023
  
  3f6b045a Browse Files
- 好办小程序菜单权限bug修复 · ce6225d8
  jinxin authored Apr 11, 2023
  
  ce6225d8 Browse Files
- feat: 小程序品牌名称 · 0b72eae1
  songyinghui authored Apr 11, 2023
  
  0b72eae1 Browse Files
- 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 11 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