Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsProductController.java

@@ -143,7 +143,7 @@ public class GoodsProductController {
                 builder.put("prodBarcode", "商品条形码");
                 builder.put("prodName", "商品中文名");
                 builder.put("prodEname", "商品英文名");
-                builder.put("prodBrand", "品牌");
+//                builder.put("prodBrand", "品牌");
                 builder.put("unitCode", "计量单位");
                 builder.put("cusGoodsCode", "商品编码");
                 builder.put("cusDeclEle", "申报要素（海关规格型号）");

kmall-admin/src/main/resources/mybatis/mapper/GoodsProductDao.xml

@@ -146,7 +146,7 @@
 		from mall_goods_product
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND `prod_name` LIKE concat('%',#{name},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -165,7 +165,7 @@
 		select count(*) from mall_goods_product
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND `prod_name` LIKE concat('%',#{name},'%')
         </if>
 	</select>
 	<select id="selectByParams" resultType="com.kmall.admin.entity.GoodsProductEntity">

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsproduct.html

@@ -19,7 +19,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.name" @on-enter="query" placeholder="中文名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>