Commits · 6a69c4f0c5da9ee87e254204ea2c8f9a2f9e27ca · haoban3.0 / haoban-manage3.0 · GitLab

31 May, 2023 2 commits
- Merge branch 'feature/五月二期' into developer · 6a69c4f0
  jinxin authored May 31, 2023
  
  6a69c4f0 Browse Files
- corpid字段显示 · 8e99b23b
  jinxin authored May 31, 2023
  
  8e99b23b Browse Files
30 May, 2023 7 commits
- Merge remote-tracking branch 'origin/feature/导购code替换' into feature/五月二期 · e3551669
  jinxin authored May 30, 2023
  
  e3551669 Browse Files
- Merge remote-tracking branch 'origin/bugfix/bug修复' into feature/五月二期 · 2824ae76
  jinxin authored May 30, 2023
  
  2824ae76 Browse Files
- 导购code替换为导购id · 38749865
  jinxin authored May 30, 2023
  
  38749865 Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-05-30' into developer · 20039a64
  jinxin authored May 30, 2023
  
  20039a64 Browse Files
- 文案调整 · a88f2d66
  jinxin authored May 30, 2023
  
  a88f2d66 Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 70550bfe
  jinxin authored May 30, 2023
  
  70550bfe Browse Files
- secret表信息 · 63587875
  jinxin authored May 30, 2023
  
  63587875 Browse Files
29 May, 2023 8 commits
- Merge remote-tracking branch 'origin/bugfix/bug修复' into developer · c80b11bd
  jinxin authored May 29, 2023
  
  c80b11bd Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 3b9b08e0
  jinxin authored May 29, 2023
  
  3b9b08e0 Browse Files
- 好办初始化权限 · f25ca3bb
  jinxin authored May 29, 2023
  
  f25ca3bb Browse Files
- 定时任务：刷新企业成员外部联系人 · 8570ad1d
  jinxin authored May 29, 2023
  
  8570ad1d Browse Files
- Merge branch 'feature/五月二期' into developer · f8338a2c
  jinxin authored May 29, 2023
  
  f8338a2c Browse Files
- 新增自建应用同步新增 · 4feb6cc3
  jinxin authored May 29, 2023
  
  4feb6cc3 Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 0af23a6a
  jinxin authored May 29, 2023
  
  0af23a6a Browse Files
- 修改 · 8f9e71f1
  jinxin authored May 29, 2023
  
  8f9e71f1 Browse Files
26 May, 2023 8 commits
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 1dac6d72
  jinxin authored May 26, 2023
  
  1dac6d72 Browse Files
- 修改 · f9c65359
  jinxin authored May 26, 2023
  
  f9c65359 Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 7debec88
  jinxin authored May 26, 2023
  
  7debec88 Browse Files
- 修改 · 3ab4374e
  jinxin authored May 26, 2023
  
  3ab4374e Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 8dfbcb0d
  jinxin authored May 26, 2023
  
  8dfbcb0d Browse Files
- 定时任务添加 · 839ec5be
  jinxin authored May 26, 2023
  
  839ec5be Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · fd7e09b9
```
# Conflicts:
#	haoban-manage3-service/pom.xml
```
  jinxin authored May 26, 2023
  fd7e09b9 Browse Files
- 定时任务添加 · 36a6b40b
  jinxin authored May 26, 2023
  
  36a6b40b Browse Files
25 May, 2023 10 commits
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 853e3d4a
  jinxin authored May 25, 2023
  
  853e3d4a Browse Files
- 日志记录 · c8c1f4f9
  jinxin authored May 25, 2023
  
  c8c1f4f9 Browse Files
- bug处理 · 40101c36
  jinxin authored May 25, 2023
  
  40101c36 Browse Files
- Merge branch 'feature/五月二期' into developer · fe7f8781
  jinxin authored May 25, 2023
  
  fe7f8781 Browse Files
- 自建类型字段处理 · 5a031ca7
  jinxin authored May 25, 2023
  
  5a031ca7 Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 242bf030
  jinxin authored May 25, 2023
  
  242bf030 Browse Files
- 自建类型字段处理 · edda8b6c
  jinxin authored May 25, 2023
  
  edda8b6c Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · efda3612
  jinxin authored May 25, 2023
  
  efda3612 Browse Files
- Merge branch 'feature/五月二期' into developer · 9dc50b8f
  jinxin authored May 25, 2023
  
  9dc50b8f Browse Files
- 自建类型字段处理 · a26a2167
  jinxin authored May 25, 2023
  
  a26a2167 Browse Files
24 May, 2023 5 commits
- Merge branch 'feature/五月需求迭代' into 'master' · 27fcc0a3
```
test

See merge request !1293
```
  徐高华 authored May 24, 2023
  27fcc0a3 Browse Files
- Merge branch 'feature/五月需求迭代' into 'developer' · ca95d3b5
```
test

See merge request !1292
```
  徐高华 authored May 24, 2023
  ca95d3b5 Browse Files
- test · e3dbb2b5
  徐高华 authored May 24, 2023
  
  e3dbb2b5 Browse Files
- Merge branch 'feature-game2' into 'master' · a99947eb
```
判空

See merge request !1291
```
  王祖波 authored May 24, 2023
  a99947eb Browse Files
- Merge branch 'feature-game2' into developer · 59fcb2cb
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
#	haoban-manage3-service/src/test/java/GroupMessageServiceTest.java
#	haoban-manage3-service/src/test/java/NotityTest.java
```
  王祖波 authored May 24, 2023
  59fcb2cb Browse Files