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

jyy

2021-03-15 a6390619c7ce74611659ba091047f9278a8404a9

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

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



       return result;
    }