Commits · fb23c9f82d78ff00868dcb8c88fa8a2cff0f46e9 · zhoujw / rs-cloud-platform-ui

07 Jan, 2021 2 commits

Merge branch 'master' into 'dev_ren' · fb23c9f8

rencs authored Jan 07, 2021

# Conflicts:
#   src/views/webSiteManagement/industryApplication/applicationCate/index.vue
#   src/views/webSiteManagement/newsCategory/nebulaDynamics/index.vue

fb23c9f8

1.7 bug · 2dcb2781
rencs authored Jan 07, 2021

2dcb2781

06 Jan, 2021 2 commits
- 行业应用部分bug修复 · d7145a32
  obt authored Jan 06, 2021
  
  d7145a32
- 行业应用部分bug修复 · 748b770c
  obt authored Jan 06, 2021
  
  748b770c
05 Jan, 2021 7 commits
- Merge branch 'dev' · b7ff6206
  周健威 authored Jan 05, 2021
  
  b7ff6206
- 联系客服-回复 · 43930c36
  lixy authored Jan 05, 2021
  
  43930c36
- 1186 影像图库订单，在后台和个人订单列表要显示尺寸和规格（具体看UI设计） · 37ff459c
  lixy authored Jan 05, 2021
  
  37ff459c
- Merge branch 'dev_ren' into 'dev' · 5560af41
  rencs authored Jan 05, 2021
```
1.5 上下架操作接口更改

See merge request !25
```
  5560af41
- Merge branch 'dev_ren' into 'master' · 376541ec
  rencs authored Jan 05, 2021
```
1.5 上下架操作接口更改

See merge request !24
```
  376541ec
- 1.5 上下架操作接口更改 · 8094adc6
  rencs authored Jan 05, 2021
  
  8094adc6
- 关于我们-图片 · 0df6c5d3
  lixy authored Jan 05, 2021
  
  0df6c5d3
04 Jan, 2021 11 commits
- Merge branch 'dev_ren' into 'dev' · aaf61f8f
  rencs authored Jan 04, 2021
```
Dev ren

See merge request !23
```
  aaf61f8f
- Merge branch 'dev_ren' into 'master' · 7cb05221
  rencs authored Jan 04, 2021
```
1.4 上传源文件

See merge request !22
```
  7cb05221
- 1.4 上传源文件 · 0b6d7446
  rencs authored Jan 04, 2021
  
  0b6d7446
- Merge branch 'dev' of http://113.105.137.151:22280/zhoujw/rs-cloud-platform-ui into dev · 53bdfc72
  lixy authored Jan 04, 2021
  
  53bdfc72
- 订单-行业应用、影像图库type · 492bc711
  lixy authored Jan 04, 2021
  
  492bc711
- Merge branch 'dev_ren' into 'dev' · 71eb5542
  rencs authored Jan 04, 2021
```
行业价格，验证样式，价格精度

See merge request !21
```
  71eb5542
- Merge branch 'dev_ren' into 'master' · 486550b3
  rencs authored Jan 04, 2021
```
行业价格，验证样式，价格精度

See merge request !20
```
  486550b3
- 行业价格，验证样式，价格精度 · c5f191de
  rencs authored Jan 04, 2021
  
  c5f191de
- Merge branch 'dev_ren' into 'dev' · ffa8f948
  rencs authored Jan 04, 2021
```
Dev ren

See merge request !19
```
  ffa8f948
- Merge branch 'dev_ren' into 'master' · 4e19cb97
  rencs authored Jan 04, 2021
```
1.4 影像图库商品介绍

See merge request !18
```
  4e19cb97
- 1.4 影像图库商品介绍 · 6d92871a
  rencs authored Jan 04, 2021
  
  6d92871a
31 Dec, 2020 1 commit
- Merge branch 'dev' · c8dc167b
  lixy authored Dec 31, 2020
  
  c8dc167b
30 Dec, 2020 3 commits
- Merge branch 'dev_ren' into 'master' · 66e6ff8c
  rencs authored Dec 30, 2020
```
12.30

See merge request !17
```
  66e6ff8c
- 12.30 · 3271010c
  rencs authored Dec 30, 2020
  
  3271010c
- 1087、1114、对公支付审核 · 3d11dfbd
  lixy authored Dec 30, 2020
  
  3d11dfbd
25 Dec, 2020 6 commits
- Merge branch 'dev_ren' into 'dev' · 09f7ddfc
  rencs authored Dec 25, 2020
```
产品介绍，

See merge request !16
```
  09f7ddfc
- Merge branch 'dev_ren' into 'master' · a6fd78de
  rencs authored Dec 25, 2020
```
产品介绍，

See merge request !15
```
  a6fd78de
- 产品介绍， · 171c920f
  rencs authored Dec 25, 2020
  
  171c920f
- Merge branch 'dev_ren' into 'dev' · 66ead8b5
  rencs authored Dec 25, 2020
```
12.25 交易保障

See merge request !14
```
  66ead8b5
- Merge branch 'dev_ren' into 'master' · b4641114
  rencs authored Dec 25, 2020
```
12.25 交易保障

See merge request !13
```
  b4641114
- 12.25 交易保障 · c3f4c8e1
  rencs authored Dec 25, 2020
  
  c3f4c8e1
24 Dec, 2020 8 commits
- Merge branch 'dev' of http://113.105.137.151:22280/zhoujw/rs-cloud-platform-ui into dev · a10f7321
  lixy authored Dec 24, 2020
```
# Conflicts:
#	src/views/orderManagement/orderList/index.vue
```
  a10f7321
- 定制订单-选择数据 · 2b67b404
  lixy authored Dec 24, 2020
  
  2b67b404
- Merge branch 'dev_ren' into 'dev' · 4a12ab1d
  rencs authored Dec 24, 2020
```
12.24 存档数据管理

See merge request !12
```
  4a12ab1d
- Merge branch 'dev_ren' into 'master' · 10997b81
  rencs authored Dec 24, 2020
```
12.24 存档数据管理

See merge request !11
```
  10997b81
- 12.24 存档数据管理 · 69a049c2
  rencs authored Dec 24, 2020
  
  69a049c2
- Merge branch 'dev_ren' into 'dev' · d9d5dabb
  rencs authored Dec 24, 2020
```
Dev ren

See merge request !10
```
  d9d5dabb
- Merge branch 'dev_ren' into 'master' · 66e8ba4e
  rencs authored Dec 24, 2020
```
Dev ren

See merge request !9
```
  66e8ba4e
- 12.24 跳转订单 · 798e7b8b
  rencs authored Dec 24, 2020
  
  798e7b8b