# Conflicts: # src/views/webSiteManagement/industryApplication/applicationCate/index.vue # src/views/webSiteManagement/newsCategory/nebulaDynamics/index.vue
1.5 上下架操作接口更改 See merge request !25
1.5 上下架操作接口更改 See merge request !24
Dev ren See merge request !23
1.4 上传源文件 See merge request !22
行业价格，验证样式，价格精度 See merge request !21
行业价格，验证样式，价格精度 See merge request !20
Dev ren See merge request !19
1.4 影像图库商品介绍 See merge request !18
12.30 See merge request !17
产品介绍， See merge request !16
产品介绍， See merge request !15
