Merge remote-tracking branch 'origin/zx_saas_goods' into zx_saas_goods

mec-common/common-core/src/main/java/com/ym/mec/common/dto/PmsProductDto.java

@@ -40,9 +40,6 @@ public class PmsProductDto implements Serializable {
     private String productCategoryName;
     // 商品图片
     private String pic;
-    // 商品详情
-    private String detailHtml;
-
 
     //"商品销售属性，json格式"
     private String spData;

mec-mall/mall-admin/src/main/resources/config/mybatis/PmsProductDao.xml

@@ -126,7 +126,6 @@
         t.brand_id as brandId,
         t.product_category_id as productCategoryId,
         t.pic as pic,
-        t.detail_html as detailHtml,
         t1.sp_data as spData
         from pms_product t
         left join pms_sku_stock t1 on t.id = t1.product_id