冲突合并

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1194,7 +1194,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         orderProduct.setInvoiceType(product.getInvoiceType());
         orderProduct.setSvipPriceFlag(0);
         //邮费默认0,skuId不能为空
-        orderProduct.setSkuId(0);
+        orderProduct.setSkuId(1);
         newOrderProductDao.insert(orderProduct);
     }
 

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -401,7 +401,7 @@ public class ProductNewController extends BaseController {
             searchFrequencyVos = keywordFrequencyDao.getKeywordList();
         }
         model.addAttribute("splitCodeList",splitCodeList);
-        model.addAttribute("splitCodeList", splitCodeList);
+        model.addAttribute("SearchFrequencyVo",searchFrequencyVos);
         model.addAttribute("combinationList", combinationList);
         model.addAttribute("brandList", brandList);
         model.addAttribute("shopList", shopList);

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -332,7 +332,7 @@
         </tr>
         <tr>
             <th>搜索关键字：</th>
-            <td colspan="3" class="skword">
+            <td colspan="3" class="skword auto-input">
                 <form:input path="searchKeyList[0]" maxlength="32" placeholder="建议输入品牌关键词"
                             onchange="checkmaxlengthsBySearch(this,this.value,32)" class="input-small"/>
                 <form:input path="searchKeyList[1]" maxlength="32" placeholder="建议输入商品学名关键词"