Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-03-15 789c5301ba9c69f779cb0b29f22857299760a960

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

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



       return result;
    }