Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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

@@ -308,8 +308,8 @@
      invalid_time,
      pay_methods,
      is_infinite,
      achieve_rule_id

      achieve_rule_id,
      is_cooperate
      )
      VALUES (
      #{id},
@@ -371,8 +371,8 @@
         #{invalidTime},
         #{payMethods},
         #{isInfinite},
         #{achieveRuleId}

         #{achieveRuleId},
          #{isCooperate}
      )
   </insert>

@@ -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查询 -->