Merge remote-tracking branch 'origin/dev-jiaxing.zhou'

@@ -219,7 +219,7 @@
         </el-col>
         </el-col>
         <!-- 按商品名汇总标志 -->
         <!-- 按商品名汇总标志 -->
         <el-col :span="3">
         <el-col :span="3">
-          <Formitem label="按商品名汇总标志" prop="itemNameFlag">
+          <Formitem label="商品名汇总标志" prop="itemNameFlag">
             <el-input
             <el-input
               type="text"
               type="text"
               class="inputShadow"
               class="inputShadow"