Merge branch 'score_shop' into api_score_meger

wzy

2021-11-11 3fd5c0a8919c5b31efb61860aeffaf932236e4a3

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

@@ -761,7 +761,8 @@
      com_logo,
      com_valid,
      com_functions,
      com_plats
      com_plats,
      com_code
      from sys_company
      <where>
         <if test="record!=null">
@@ -860,4 +861,7 @@
         </if>
      </where>
   </select>
   <select id="selectAll" resultMap="SysCompanyMap">
      select * from sys_company
   </select>
</mapper>