Merge remote-tracking branch 'origin/dev' into devops

# Conflicts:
#	library/apps/AppBuilding/AiImage.vue
#	library/apps/AppBuilding/AiUploader.vue

library/project/lianhuaH5/AppPatrolReport/AppPatrolReport.vue

@@ -50,9 +50,11 @@
 
 <script>
 import {mapState} from 'vuex'
+import AiUploader from './AiUploader'
 export default {
   name: 'AppPatrolReport',
   appName: '事件添加',
+  components: {AiUploader},
   data() {
     return {
       forms: {