Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/bpm/processInstance/detail.vue

@@ -131,7 +131,7 @@ import {approveTask, getTaskListByProcessInstanceId, rejectTask, updateTaskAssig
 import {getDate} from "@/utils/dateUtils";
 import {listSimpleUsers} from "@/api/system/user";
 import {getActivityList} from "@/api/bpm/activity";
-import SpecialDetail from "@/views/ecw/offer/components/specialDetail"
+import SpecialDetail from "@/views/ecw/offer/components/SpecialDetail"
 import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
 import shippingDetail from '@/views/ecw/box/shippingDetail'
 import SplitDetail from '@/views/ecw/order/components/SplitDetail'

src/views/ecw/offer/special.vue

@@ -98,7 +98,7 @@ import {getProductAttrList} from "@/api/ecw/productAttr"
 import { parseTime } from '@/utils/ruoyi'
 import {listByIds} from '@/api/ecw/region'
 import {getChannel} from '@/api/ecw/channel'
-import SpecialDiscount from '@/views/ecw/offer/components/specialDiscount'
+import SpecialDiscount from '@/views/ecw/offer/components/SpecialDiscount'
 import Commossion from '@/views/ecw/offer/components/Commossion'
 
 export default {