Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-11-30 c5fab4fccba20578c46462d44accd05bd7f9330a

 zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml

@@ -861,4 +861,7 @@
         </if>
      </where>
   </select>
   <select id="selectAll" resultMap="SysCompanyMap">
      select * from sys_company
   </select>
</mapper>