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

2022-09-27 10:06:31 +08:00
parent 78faa6dfd5 3b549ab1d4
commit fe2d9e5be6
83 changed files with 555 additions and 861 deletions
@@ -2039,6 +2039,9 @@
                    } else if (type === 6) {
                        this.goProcess(item)
                    }
+                    if (item.nameshow === '' || item.nameshow === null){
+                        item.nameshow = item.standEnName
+                    }

                    // 先不加判断
                    // if (type === 1) {