Merge branch 'score_shop' into api_score_meger

jyy

2021-07-28 8d5f34d66f7339390ac63e92c3a065d1db3e05c4

 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>