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

935090232@qq.com

2021-10-06 1d394446abb8465e63fd1fd9a768796e149edbd6

 zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html

@@ -65,7 +65,7 @@
            </tr>
            <template v-for="item in projService.serviceItems">
                <tr  >
                    <td style="text-align: left;" colspan="4" >{{item.projInfo.name }}</td>
                    <td style="text-align: left;" colspan="4" >{{item.projInfo.name }}【{{item.projUse.source}}】</td>
                </tr>
                <tr  >
                    <td>{{item.count }}</td>