Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/views/finance/invoice/index.vue
#	sql/ry-vue.sql

ruoyi-system/src/main/java/com/ruoyi/system/domain/FncInvoice.java

@@ -66,8 +66,8 @@ public class FncInvoice extends BaseEntity {
     /**
      * 发票日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "发票日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发票日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date invoiceDate;
 
     /**

ruoyi-system/src/main/resources/mapper/finance/FncInvoiceMapper.xml

@@ -104,7 +104,7 @@
 
     <select id="queryById" resultType="com.ruoyi.system.domain.vo.FncInvoiceVo">
         <include refid="querySql"/>
-        and A.invoice_id = #{id}
+        where A.invoice_id = #{id}
     </select>
 
     <sql id="allField">

ruoyi-ui/src/views/finance/ledger/index.vue

@@ -179,6 +179,7 @@ import {
 import { getToken } from "@/utils/auth";
 export default {
   name: "Ledger",
+
   data() {
     return {
       // 遮罩层