基层智治-前端
parent: f89867 | patch | commitdiff
linwei
2024-01-10 ca788e3a4122fbeb46947be76ec21625306fa0a7
refs
author linwei <872216696@qq.com>
Wednesday, January 10, 2024 10:16 +0800
committer linwei <872216696@qq.com>
Wednesday, January 10, 2024 10:16 +0800
commitca788e3a4122fbeb46947be76ec21625306fa0a7
tree 61926ac62cb849057c01b17b889dd28e9dbac5c5 tree | zip | gz
parent f89867e71936474a1afd1994e49a3f55d937ec33 view | diff
ca70eec16d4ae666d2beb560319860d30a1c17cd view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/publicSecurity/bailReporting.vue
#	src/views/publicSecurity/keynotePlaceManage.vue
33 files modified
14803 ■■■■■ changed files
src/views/article/article.vue 19 ●●●●● diff | view | raw | blame | history
src/views/article/components/discussionManageChild.vue 2 ●●●●● diff | view | raw | blame | history
src/views/article/discussionManage.vue 19 ●●●●● diff | view | raw | blame | history
src/views/article/publicSignUp.vue 19 ●●●●● diff | view | raw | blame | history
src/views/cGovernance/gridPatrolRecord.vue 13 ●●●●● diff | view | raw | blame | history
src/views/cGovernance/gridWorkLog.vue 11 ●●●●● diff | view | raw | blame | history
src/views/cGovernance/punchCard.vue 16 ●●●●● diff | view | raw | blame | history
src/views/cGovernance/taskECall.vue 37 ●●●●● diff | view | raw | blame | history
src/views/community/index.vue 2 ●●●●● diff | view | raw | blame | history
src/views/district/index.vue 2 ●●●●● diff | view | raw | blame | history
src/views/flow/deploy.vue 280 ●●●●● diff | view | raw | blame | history
src/views/flow/follow.vue 376 ●●●●● diff | view | raw | blame | history
src/views/flow/manager.vue 613 ●●●●● diff | view | raw | blame | history
src/views/flow/model.vue 871 ●●●●● diff | view | raw | blame | history
src/views/grid/gridman.vue 14 ●●●●● diff | view | raw | blame | history
src/views/gzll/owners.vue 77 ●●●●● diff | view | raw | blame | history
src/views/property/components/partyOrganizationMember.vue 1104 ●●●●● diff | view | raw | blame | history
src/views/property/convenienceHotline.vue 530 ●●●●● diff | view | raw | blame | history
src/views/property/inviteTenders.vue 1428 ●●●●● diff | view | raw | blame | history
src/views/property/oiae.vue 63 ●●●●● diff | view | raw | blame | history
src/views/property/partyOrganization.vue 912 ●●●●● diff | view | raw | blame | history
src/views/property/propertyCapitalApply.vue 43 ●●●●● diff | view | raw | blame | history
src/views/property/propertyCharge.vue 682 ●●●●● diff | view | raw | blame | history
src/views/property/propertyChargeRecord.vue 631 ●●●●● diff | view | raw | blame | history
src/views/property/propertyCompany.vue 1014 ●●●●● diff | view | raw | blame | history
src/views/property/propertyCompanyDistrict.vue 45 ●●●●● diff | view | raw | blame | history
src/views/publicSecurity/bailReporting.vue 784 ●●●●● diff | view | raw | blame | history
src/views/publicSecurity/keynotePlaceManage.vue 1063 ●●●●● diff | view | raw | blame | history
src/views/report/reportlist.vue 366 ●●●●● diff | view | raw | blame | history
src/views/resource/attach.vue 523 ●●●●● diff | view | raw | blame | history
src/views/resource/oss.vue 771 ●●●●● diff | view | raw | blame | history
src/views/resource/sms.vue 817 ●●●●● diff | view | raw | blame | history
src/views/task/reportForRepairs.vue 1656 ●●●●● diff | view | raw | blame | history