Merge branch 'score_shop' into api_score_meger

jyy

2021-08-09 cabd43861c6dddaddb30e1fe4dbcdb072e3fb7b7

 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>