Merge branch 'score_shop' into api_score_meger

Helius

2021-11-19 66f8eeab8b21f81e310d3f7cbc2766bb8b2ec0d5

 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>