Merge branch 'developer' into alpha

935090232@qq.com

2022-05-03 3236778a727a75bdb2f6fcb752c59068ec12ac28

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

@@ -211,7 +211,10 @@

   <select id="selectChildNodesByName" resultMap="ShoppingGoodsCategoryMap">
      select * from shopping_goods_category a
      inner join shopping_goods_category b on a.parent_id=b.id and b.name=#{record.name} and b.parent_id=0
      inner join shopping_goods_category b on a.parent_id=b.id and b.parent_id=0
      <if test="record.name != null and record.name != ''">
         and b.name=#{record.name}
      </if>
      <where>
         <if test="record.shopId != null">
            and a.shop_id=#{record.shopId}