Merge remote-tracking branch 'origin/master'

admin

2019-04-04 3a6e476b2f498e876ff10f1328455f58e63ee85a

 fanli/src/main/java/com/yeshi/fanli/mapping/taobao/TaoBaoGoodsBriefMapper.xml

@@ -688,7 +688,7 @@
         </trim>
         
         
         <trim prefix="materialLibType =case" suffix="end,">
         <trim prefix="material_lib_type =case" suffix="end,">
            <foreach collection="list" item="item" index="index">
               <if test="item.materialLibType !=null">
                  when id=#{item.id} then #{item.materialLibType}