Merge branch 'Regulation' of http://git.izouma.com/licailing/wenlvju into Regulation

src/main/vue/package-lock.json

@@ -2030,6 +2030,7 @@
             "unique-filename": "^1.1.1"
           }
         },
+<<<<<<< HEAD
 <<<<<<< HEAD
         "chalk": {
           "version": "4.1.2",
@@ -2053,6 +2054,8 @@
           }
         },
 =======
+>>>>>>> 6f464b2555e142a0df97473c6cdddc73dc7a77a0
+=======
 >>>>>>> 6f464b2555e142a0df97473c6cdddc73dc7a77a0
         "debug": {
           "version": "4.3.1",
@@ -2101,6 +2104,7 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+<<<<<<< HEAD
 <<<<<<< HEAD
         },
         "vue-loader-v16": {
@@ -2115,6 +2119,8 @@
             "loader-utils": "^2.0.0"
           }
 =======
+>>>>>>> 6f464b2555e142a0df97473c6cdddc73dc7a77a0
+=======
 >>>>>>> 6f464b2555e142a0df97473c6cdddc73dc7a77a0
         }
       }