Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

 zq-erp/src/main/java/com/matrix/system/common/tag/MatrixProcessorDialect.java

@@ -47,7 +47,6 @@
   public Set<IProcessor> getProcessors(final String dialectPrefix) {
      final Set<IProcessor> processors = new HashSet<IProcessor>();
      processors.add(new ButtonRoleAttributeTagProcessor(dialectPrefix));
      processors.add(new ButtonRoleJsTagProcessor(dialectPrefix));
      processors.add(new ButtonRoleFnTagProcessor(dialectPrefix));
      // This will remove the xmlns:matrix attributes we might add for IDE validation
      processors.add(new StandardXmlNsTagProcessor(TemplateMode.HTML, dialectPrefix));