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

@@ -94,6 +94,7 @@ public class MybatisInterceptor implements Interceptor {
         add("erp_purchase_plan_item");
         add("erp_purchase_plan_item");
         add("erp_purchase_material");
         add("erp_purchase_material");
         add("erp_distribut_material");
         add("erp_distribut_material");
+        add("erp_settlement");//供应商结算、水厂结算
         //共享风险库
         //共享风险库
         add("danger_level_manage_share");
         add("danger_level_manage_share");
         // 库存表
         // 库存表