提交代码

08.src/Xingxi/xingxi-admin/src/main/resources/mapper/ProdInventoryVoMapper.xml

@@ -15,6 +15,7 @@
         <result property="updateTime"   column="updateTime"     />
         <result property="prodName"     column="prodName"       />
         <result property="attrName"     column="attrName"       />
+        <result property="mercName"     column="mercName"       />
     </resultMap>
 
     <sql id="selectProdInventoryVo">
@@ -26,6 +27,7 @@
              , ifnull(t_prod_inventory.availQty, 0) as availQty
              , m_prod.prodName
              , m_prod_attr.attrName
+             , m_merchant.mercName
         from m_merchant
         inner join m_merchant_prod on m_merchant_prod.mercId = m_merchant.mercId
         inner join m_prod on m_prod.id = m_merchant_prod.prodId

08.src/Xingxi/xingxi-admin/src/main/resources/templates/business/prodInventory/prodInventory.html

@@ -48,6 +48,10 @@
                 pageList: [10, 25, 50],
                 columns: [
                 {
+                    field: 'mercName',
+                    title: '店铺名称'
+                },
+                {
                     field: 'prodName',
                     title: '商品名称'
                 },