Merge branch 'feature/product' into test

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductPartInfoVO.java

@@ -25,6 +25,11 @@ public class ProductPartInfoVO {
      */
     private String attrName;
 
+    /**
+     * 描述
+     */
+    private String describe;
+
     /**
      * 项
      */

nflg-mobilebroken-repository/src/main/resources/mapper/ProductPartMapper.xml

@@ -14,7 +14,7 @@
                 AND pp.attr_id=#{request.attrId}
             </if>
             <if test="request.name!=null and request.name!=''">
-                AND pp.`name` LIKE CONCAT('%', #{request.name}, '%')
+                AND (pp.`name` LIKE CONCAT('%', #{request.name}, '%') or pp.`describe` LIKE CONCAT('%', #{request.name}, '%'))
             </if>
         </where>
         ORDER BY pp.enable DESC,pp.id DESC