Merge branch 'developer' into alpha

姜友瑶

2022-05-05 c41e8d372cdabbe1fd5973c9322e38a40bfa1a39

Merge branch 'developer' into alpha

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml

@@ -897,7 +897,7 @@
        t.id=cate_id)
        cate_name
        from shopping_goods a
        where code=#{code}
        where a.code=#{code}  and a.is_del=1
    </select>

    <!-- 根据id查询 -->