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

03 Feb, 2023 18 commits
- 转移操作日志处理 · ee35946f
  jinxin authored Feb 03, 2023
  
  ee35946f Browse Files
- 转移接口处理 · 774ee2f1
  jinxin authored Feb 03, 2023
  
  774ee2f1 Browse Files
- 转移接口处理 · 5134e66d
  jinxin authored Feb 03, 2023
  
  5134e66d Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 3f4c3373
  jinxin authored Feb 03, 2023
  
  3f4c3373 Browse Files
- 转移接口处理 · fe2c17c7
  jinxin authored Feb 03, 2023
  
  fe2c17c7 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · d578f42a
  徐高华 authored Feb 03, 2023
  
  d578f42a Browse Files
- 增加成员离职时间 · e6da0df2
  徐高华 authored Feb 03, 2023
  
  e6da0df2 Browse Files
- 转移接口处理 · 223ea1ad
  jinxin authored Feb 03, 2023
  
  223ea1ad Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · de59dca3
  徐高华 authored Feb 03, 2023
  
  de59dca3 Browse Files
- 激活码查询改成批量 · 54a473df
  徐高华 authored Feb 03, 2023
  
  54a473df Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · cd6e5442
  jinxin authored Feb 03, 2023
  
  cd6e5442 Browse Files
- 好办后台接口参数修改 · 8b9516e3
  jinxin authored Feb 03, 2023
  
  8b9516e3 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · fc1504ab
```
目标跟进：接口公用参数调整

See merge request !929
```
  guojx authored Feb 03, 2023
  fc1504ab Browse Files
- 目标跟进：接口公用参数调整 · ce3172ca
  guojx authored Feb 03, 2023
  
  ce3172ca Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 1075bede
```
目标跟进：接口公用参数调整

See merge request !928
```
  guojx authored Feb 03, 2023
  1075bede Browse Files
- 目标跟进：接口公用参数调整 · 799df82f
  guojx authored Feb 03, 2023
  
  799df82f Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · eb85b4c6
```
目标跟进：接口公用参数调整

See merge request !927
```
  guojx authored Feb 03, 2023
  eb85b4c6 Browse Files
- 目标跟进：接口公用参数调整 · 82087dd3
  guojx authored Feb 03, 2023
  
  82087dd3 Browse Files
02 Feb, 2023 22 commits
- 导出 · 47392f2f
  徐高华 authored Feb 02, 2023
  
  47392f2f Browse Files
- 导出 · 7a0e2e6b
  徐高华 authored Feb 02, 2023
  
  7a0e2e6b Browse Files
- 日志记录 · 783be05c
  jinxin authored Feb 02, 2023
  
  783be05c Browse Files
- sql修改 · 8f4ca9aa
  jinxin authored Feb 02, 2023
  
  8f4ca9aa Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · af78763c
  jinxin authored Feb 02, 2023
  
  af78763c Browse Files
- 已激活去掉状态是5的许可 · 77577f1b
  jinxin authored Feb 02, 2023
  
  77577f1b Browse Files
- sql · 23931aa1
  徐高华 authored Feb 02, 2023
  
  23931aa1 Browse Files
- 增加activeStatus字段 · 92bdaf9b
  jinxin authored Feb 02, 2023
  
  92bdaf9b Browse Files
- sql修改 · 26016914
  jinxin authored Feb 02, 2023
  
  26016914 Browse Files
- 其他占用许可总数sql修改 · f26cdb41
  jinxin authored Feb 02, 2023
  
  f26cdb41 Browse Files
- 通讯录成员转移接口开发 · e0821eee
  jinxin authored Feb 02, 2023
  
  e0821eee Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 1f55132a
  jinxin authored Feb 02, 2023
  
  1f55132a Browse Files
- 通讯录成员转移接口开发 · d5a70cea
  jinxin authored Feb 02, 2023
  
  d5a70cea Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 40fc96e7
  徐高华 authored Feb 02, 2023
  
  40fc96e7 Browse Files
- sql · f6c0ddf2
  徐高华 authored Feb 02, 2023
  
  f6c0ddf2 Browse Files
- 通讯录成员转移接口开发 · cd2c72bb
  jinxin authored Feb 02, 2023
  
  cd2c72bb Browse Files
- sql · 44728780
  徐高华 authored Feb 02, 2023
  
  44728780 Browse Files
- sql · 3e043139
  徐高华 authored Feb 02, 2023
  
  3e043139 Browse Files
- sql · da5b1346
  徐高华 authored Feb 02, 2023
  
  da5b1346 Browse Files
- 激活码 · aa968e85
  徐高华 authored Feb 02, 2023
  
  aa968e85 Browse Files
- 激活码查询 · 6654f034
  徐高华 authored Feb 02, 2023
  
  6654f034 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_0202' into developer · 70f108dd
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java
```
  徐高华 authored Feb 02, 2023
  70f108dd Browse Files