Merge branch 'score_shop' into api_score_meger

wzy

2021-11-21 befa8124e15d7d7e2d2026c2596561b11a9ee573

 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>