Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-29 35cea8fd3552a048ed49d0596b647c983e148644

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

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