Merge branch 'dev_test' into dev_20230829_change

# Conflicts: # src/pages/home2/index.vue
2023-11-10 13:15:58 +08:00
parent f0063727f8 2ea1dcec49
commit 4b28d6e5fd
182 changed files with 5779 additions and 561 deletions
@@ -3128,7 +3128,7 @@ export default {
    },
    selectMenu2(res,json) {
      return new Promise((resolve, reject) => {
-        this.$http.get('lawss/sarMenuStandardLimit/getListStandLimit', {dicId:'9m4qqqaansxmox5e82zm'}, {
+        this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, {
          _this: this
        }, res => {
          const history = res;