Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml

@@ -101,4 +101,12 @@
      where a.id = #{logisticsId}
   </select>

   <select id="selectActivitySignWriteoffByUserIDAndReceiveId" resultType="com.matrix.system.activity.entity.ActivitySignWriteoff">
      SELECT
         *
      FROM
         shop_delivery_info a
      where a.id = #{logisticsId}
   </select>

</mapper>