From c27edf9c5689c80b2cc1f4eafb3f929bee8c4d09 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 18:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
index 285bcaf..c2edf64 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
@@ -136,7 +136,7 @@
      * @param baseGoodsModelsId
      * @return
      */
-    private String QUERY_GOODS_MODEL_INFO = "SELECT goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id";
+    private String QUERY_GOODS_MODEL_INFO = "SELECT CLASSIFICATION type, goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id";
 
     public List<Map<String, Object>> queryGoodsModelInfo(Long baseGoodsModelsId) {
         StringBuilder sql = new StringBuilder(QUERY_GOODS_MODEL_INFO);

--
Gitblit v1.9.1