Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-15 53939e0ceb528f45c4906c86ce499ecb864f7af8

 zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java

@@ -100,9 +100,6 @@
             }
          }
       }



       return result;
    }