Merge remote-tracking branch 'origin/master'

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

Merge remote-tracking branch 'origin/master'
# Conflicts: # ruoyi-ui/src/views/finance/invoice/index.vue # sql/ry-vue.sql
8254fab6 · 蒋凌峰 · cb1a43a5 · b884d368 · 8254fab6 · 8254fab6
Commit 8254fab6 authored Nov 23, 2022 by 蒋凌峰 😉
5 changed files
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FncInvoice.java
+++ b/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")
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "发票日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发票日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date invoiceDate;
    /**

--- a/ruoyi-system/src/main/resources/mapper/finance/FncInvoiceMapper.xml
+++ b/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">

--- a/ruoyi-ui/src/views/finance/invoice/index.vue
+++ b/ruoyi-ui/src/views/finance/invoice/index.vue
 <template>
  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+      label-width="68px">
      <el-form-item label="公司名称" prop="companyName">
        <!-- <el-input v-model="queryParams.companyName" placeholder="请输入公司名称" clearable
          @keyup.enter.native="handleQuery" /> -->
@@ -13,19 +13,21 @@
      </el-form-item>
      <el-form-item label="发票类型" prop="invoiceType">
        <el-select v-model="queryParams.invoiceType" placeholder="请选择发票类型" clearable>
-          <el-option v-for="item in invoiceTypeList" :key="item.value" :label="item.label" :value="item.value">
+          <el-option v-for="item in invoiceTypeList" :key="item.value" :label="item.label"
+            :value="item.value">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="发票性质" prop="invoiceNature">
        <el-select v-model="queryParams.invoiceNature" placeholder="请选择发票性质" clearable>
-          <el-option v-for="item in invoiceNatureList" :key="item.value" :label="item.label" :value="item.value">
+          <el-option v-for="item in invoiceNatureList" :key="item.value" :label="item.label"
+            :value="item.value">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="发票日期" prop="invoiceDate">
-        <el-date-picker clearable v-model="queryParams.invoiceDate" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+        <el-date-picker clearable v-model="queryParams.invoiceDate" type="date"
-          placeholder="请选择发票日期">
+          value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择发票日期">
        </el-date-picker>
      </el-form-item>
@@ -42,12 +44,12 @@
          v-hasPermi="['finance:invoice:add']">新增</el-button>
      </el-col>
      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
-          v-hasPermi="['finance:invoice:edit']">修改</el-button>
+          @click="handleUpdate" v-hasPermi="['finance:invoice:edit']">修改</el-button>
      </el-col>
      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-          v-hasPermi="['finance:invoice:remove']">删除</el-button>
+          @click="handleDelete" v-hasPermi="['finance:invoice:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -102,39 +104,41 @@
      </el-table-column>
    </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-      @pagination="getList" />
+      :limit.sync="queryParams.pageSize" @pagination="getList" />
    <!-- 添加或修改发票对话框 -->
    <el-drawer :title="title" :visible.sync="open" size="90%" append-to-body>
      <el-row :gutter="20" type="flex">
+        <el-col :span="9" :offset="0" style="height: 500px">
-        <el-col :span="9" :offset="0"  style="height:500px;">
          <div>
            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
              <el-divider content-position="center">发票基本信息</el-divider>
              <el-row :gutter="20">
-                <el-col :span="12" :offset="0">
+                <!-- <el-col :span="12" :offset="0">
                  <el-form-item label="公司id" prop="companyId">
                    <el-input v-model="form.companyId" placeholder="请输入公司id" />
                  </el-form-item>
-                </el-col>
+                </el-col> -->
                <el-col :span="12" :offset="0">
-                  <el-form-item label="公司名称" prop="companyName">
+                  <el-form-item label="公司" prop="companyName">
-                    <el-input v-model="form.companyName" placeholder="请输入公司名称" />
+                    <el-select v-model="form.companyName" placeholder="请选择公司名称" clearable
+                      @change="changeCompany">
+                      <el-option v-for="item in companyList" :key="item.companyId"
+                        :label="item.companyName" :value="item">
+                      </el-option>
+                    </el-select>
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row :gutter="20">
                <el-col :span="12" :offset="0">
                  <el-form-item label="发票类型" prop="invoiceType">
-                    <el-select v-model="queryParams.invoiceType" placeholder="请选择发票类型" clearable>
+                    <el-select v-model="form.invoiceType" placeholder="请选择发票类型" clearable>
-                      <el-option v-for="item in invoiceTypeList" :key="item.value" :label="item.label"
+                      <el-option v-for="item in invoiceTypeList" :key="item.value"
-                        :value="item.value">
+                        :label="item.label" :value="item.value">
                      </el-option>
                    </el-select>
                  </el-form-item>
@@ -142,8 +146,8 @@
                <el-col :span="12" :offset="0">
                  <el-form-item label="发票性质" prop="invoiceNature">
                    <el-select v-model="form.invoiceNature" placeholder="请选择发票性质" clearable>
-                      <el-option v-for="item in invoiceNatureList" :key="item.value" :label="item.label"
+                      <el-option v-for="item in invoiceNatureList" :key="item.value"
-                        :value="item.value">
+                        :label="item.label" :value="item.value">
                      </el-option>
                    </el-select>
                  </el-form-item>
@@ -157,22 +161,19 @@
                </el-col>
                <el-col :span="12" :offset="0">
                  <el-form-item label="发票日期" prop="invoiceDate">
-                    <el-date-picker clearable v-model="form.invoiceDate" type="date" value-format="yyyy-MM-dd"
+                    <el-date-picker clearable v-model="form.invoiceDate" type="date"
-                      placeholder="请选择发票日期">
+                      value-format="yyyy-MM-dd" placeholder="请选择发票日期">
                    </el-date-picker>
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row :gutter="20">
                <el-col :span="12" :offset="0">
                  <el-form-item label="申请人" prop="applicant">
                    <el-input v-model="form.applicant" placeholder="请输入申请人" />
                  </el-form-item>
                </el-col>
                <el-col :span="12" :offset="0">
                  <el-form-item label="审核人" prop="checker">
                    <el-input v-model="form.checker" placeholder="请输入审核人" />
                  </el-form-item>
@@ -182,7 +183,6 @@
              <el-divider content-position="center">购买方信息</el-divider>
              <el-row :gutter="20">
                <el-col :span="12" :offset="0">
                  <el-form-item label="名称" prop="buyName">
                    <el-input v-model="form.buyName" placeholder="请输入购买方名称" />
                  </el-form-item>
@@ -207,7 +207,6 @@
              </el-row>
              <el-row :gutter="20">
                <el-col :span="12" :offset="0">
                  <el-form-item label="开户行" prop="buyBankDeposit">
                    <el-input v-model="form.buyBankDeposit" placeholder="请输入购买方开户行" />
                  </el-form-item>
@@ -222,11 +221,13 @@
              <el-divider content-position="center">发票项信息</el-divider>
              <el-row :gutter="10" class="mb8">
                <el-col :span="1.5">
-                  <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddFncInvoiceItem">添加
+                  <el-button type="primary" icon="el-icon-plus" size="mini"
+                    @click="handleAddFncInvoiceItem">添加
                  </el-button>
                </el-col>
                <el-col :span="1.5">
-                  <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteFncInvoiceItem">删除
+                  <el-button type="danger" icon="el-icon-delete" size="mini"
+                    @click="handleDeleteFncInvoiceItem">删除
                  </el-button>
                </el-col>
              </el-row>
@@ -234,11 +235,11 @@
                @selection-change="handleFncInvoiceItemSelectionChange" ref="fncInvoiceItem">
                <el-table-column type="selection" width="50" align="center" />
                <el-table-column label="序号" align="center" prop="index" width="50" />
-                <el-table-column label="发票id" prop="invoiceId" width="150">
+                <!-- <el-table-column label="发票id" prop="invoiceId" width="150">
                  <template slot-scope="scope">
                    <el-input v-model="scope.row.invoiceId" placeholder="请输入发票id" />
                  </template>
-                </el-table-column>
+                </el-table-column> -->
                <el-table-column label="货物或应税劳务、服务名称" prop="objectName" width="150">
                  <template slot-scope="scope">
                    <el-input v-model="scope.row.objectName" placeholder="请输入货物或应税劳务、服务名称" />
@@ -254,42 +255,60 @@
                    <el-input v-model="scope.row.unit" placeholder="请输入单位" />
                  </template>
                </el-table-column>
-                <el-table-column label="数量" prop="quantity" width="150">
+                <el-table-column label="数量" prop="quantity" width="210">
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.quantity" placeholder="请输入数量" />
+                    <el-input-number v-model="scope.row.quantity" placeholder="请输入数量"
+                      controls-position="right" :precision="2" />
                  </template>
                </el-table-column>
-                <el-table-column label="单价(含税)" prop="unitPriceTax" width="150">
+                <el-table-column label="单价(含税)" prop="unitPriceTax" width="210">
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.unitPriceTax" placeholder="请输入单价(含税)" />
+                    <el-input-number controls-position="right" v-model="scope.row.unitPriceTax"
+                      placeholder="请输入单价(含税)" :precision="2" />
                  </template>
                </el-table-column>
-                <el-table-column label="金额(不含税)" prop="amountNoTax" width="150">
+                <!-- <el-table-column
+                  label="金额(不含税)"
+                  prop="amountNoTax"
+                  width="100"
+                >
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.amountNoTax" placeholder="请输入金额(不含税)" />
+                    <el-input-number
+                    controls-position="right"
+                      v-model="scope.row.amountNoTax"
+                      placeholder="请输入金额(不含税)"
+                      :precision="2"
+                    />
                  </template>
-                </el-table-column>
+                </el-table-column> -->
-                <el-table-column label="税率" prop="taxRate" width="150">
+                <el-table-column label="税率" prop="taxRate" width="210">
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.taxRate" placeholder="请输入税率" />
+                    <el-input-number controls-position="right" v-model="scope.row.taxRate"
+                      placeholder="请输入税率" :precision="2" :min="0" :max="100" />
                  </template>
                </el-table-column>
-                <el-table-column label="税额" prop="taxAmount" width="150">
+                <!-- <el-table-column label="税额" prop="taxAmount" width="100">
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.taxAmount" placeholder="请输入税额" />
+                    <el-input
+                      v-model="scope.row.taxAmount"
+                      placeholder="请输入税额"
+                    />
                  </template>
-                </el-table-column>
+                </el-table-column> -->
              </el-table>
              <el-divider content-position="center">销售方信息</el-divider>
              <el-row :gutter="20">
                <el-col :span="12" :offset="0">
                  <el-form-item label="名称" prop="saleName">
                    <el-input v-model="form.saleName" placeholder="请输入销售方名称" />
                  </el-form-item>
                </el-col>
+                <el-col :span="12" :offset="0">
+                  <el-form-item label="账号" prop=" saleBankAccount">
+                    <el-input v-model="form.saleBankAccount" placeholder="请输入销售方银行卡账号" />
+                  </el-form-item>
+                </el-col>
              </el-row>
              <el-row :gutter="20">
@@ -355,7 +374,6 @@
                  <el-form-item label="复核人" prop="reviewer">
                    <el-input v-model="form.reviewer" placeholder="请输入复核人" />
                  </el-form-item>
                </el-col>
                <el-col :span="12" :offset="0">
                  <el-form-item label="收款人" prop="payee">
@@ -378,48 +396,60 @@
              </el-row>
              <el-row :gutter="20">
-                <el-col :span="12" :offset="0"></el-col>
+                <el-col :span="12" :offset="0">
-                <el-col :span="12" :offset="0"></el-col>
+                  <el-button type="primary" @click="submitForm">提交</el-button>
+                </el-col>
              </el-row>
            </el-form>
          </div>
          <!-- <div slot="footer" class="dialog-footer">
            <el-button type="primary" @click="submitForm">确 定</el-button>
            <el-button @click="cancel">取 消</el-button>
          </div> -->
        </el-col>
-        <el-col :span="15" :offset="0"  style="height:500px;">
+        <el-col :span="15" :offset="0" style="height: 500px;">
+          <body style="height: 100%">
+            <div class="toptip c-red">
+              模板样式仅供参考，不可用于实际开票依据！
+            </div>
-          <body style="height: 100%;">
-            <div class="toptip c-red">模板样式仅供参考，不可用于实际开票依据！</div>
            <div class="invoicMain" id="printDiv">
+              <div class="companyname">{{form.companyName}}</div>
              <!-- head start -->
              <div class="invoiceHeader">
-                <div class="headerLeft">
+                <!-- <div class="headerLeft">
                  <div>
-                    <!-- <img src="qrcode.png" width="83" height="83" alt=""> -->
-                  </div>
                  </div>
+                </div> -->
+                <div class="title">
                  <div class="headerMiddle">
-                  <h1>增值税专用发票</h1>
+                    <h1>{{form.invoiceType | typeFilter(this_)}}</h1>
-                  <div class="line"></div>
+                    <!-- <div class="line"></div> -->
                  </div>
                  <div class="headerRight">
+                    <h1><span style="color:red">{{form.invoiceNature | natureFilter(this_)}}</span>开票通知单</h1>
+                    <!-- <p><label>开票日期：</label><span> 2021年06月07日</span></p> -->
+                  </div>
+                </div>
+              </div>
-                  <p><label>开票日期：</label><span> 2021年06月07日</span></p>
+              <div class="neck">
+                <div class="department">
+                  <span><strong>部门:</strong></span>
+                  {{ form.depName}}
+                </div>
+                <div class="applicant">
+                  <span><strong>申请人:</strong></span>
+                  {{ form.applicant}}
+                </div>
+                <div class="date">
+                  <span><strong>日期:</strong></span>
+                  {{form.invoiceDate}}
                </div>
              </div>
              <!-- head end -->
@@ -429,24 +459,57 @@
                  <div class="buy">购买方</div>
                  <ul>
                    <li>
-                      <label>名&nbsp;&nbsp;&nbsp;&nbsp;称：</label><span>山东济南网络信息技术有限公司</span>
+                      <label>名&nbsp;&nbsp;&nbsp;&nbsp;称：</label><span>{{form.buyName}}</span>
                    </li>
                    <li>
-                      <label>纳税人识别号：</label><span class="f-big">913564523096023930</span>
+                      <label>纳税人识别号：</label><span class="f-big">{{form.buyTaxpayerNo}}</span>
                    </li>
                    <li>
-                      <label>地址、&nbsp;电话：</label><span class="f-small">济南市槐荫区经十路4214209号
+                      <label>地址、&nbsp;电话：</label><span class="f-small">{{form.buyAddress}}
-                        0531-85094547</span>
+                        {{form.buyPhone}}</span>
                    </li>
                    <li>
-                      <label>开户行及账号：</label><span class="f-small">中国银行股份有限公司济南大学科技园支行
+                      <label>开户行及账号：</label><span class="f-small">{{form.buyBankDeposit}}
-                        6225885410839945</span>
+                        {{form.buyBankAccount}} </span>
                    </li>
                  </ul>
-                  <div class="password">密码区</div>
+                  <!-- <div class="password"></div> -->
-                  <div class="pwdInfo"><span class="f-big">0357+39177127583965+0*13>3>0<>
+                  <div style="width:500px;line-height:25px;font-weight:bold;overflow:hidden">
-                        <22908-+<+03*<-84>40>
+                    <div>
-                          <3<64-076746-2+2082*9112+057188 /07-228<135701+4 />039*1630-817</span>>
+                      <span style="color:green">部门:</span>
+                      <span>{{ form.depName}}</span>
+                    </div>
+                    <div>
+                      <span style="color:green">申请人:</span>
+                      <span>{{ form.applicant}}</span>
+                    </div>
+                    <div>
+                      <span style="color:green">审核人:</span>
+                      <span>{{form.checker}}</span>
+                    </div>
+                    <div>
+                      <span style="color:green"> 项目编号/发票号码:</span>
+                      <span>{{form.projectOrInvoiceNo}}</span>
+                    </div>
+                    <!-- <ul>
+                      <li>
+                        <label 
+                          >部门:</label
+                        ><span >{{ form.depName}}</span>
+                      </li>
+                      <li>
+                        <label
+                          >申请人:</label
+                        ><span> {{ form.applicant}}</span>
+                      </li>
+                      <li>
+                        <label
+                          >审&#12288;&#12288;&#12288;核&#12288;&#12288;&#12288;人:</label
+                        ><span>{{form.checker}}</span>
+                      </li>
+                      <li><label>项目编号/发票号码:</label><span >{{form.projectOrInvoiceNo}}</span></li>
+                    </ul> -->
                  </div>
                </div>
                <div>
@@ -457,98 +520,172 @@
                        <td style="width: 10%">规格型号</td>
                        <td style="width: 7%">单位</td>
                        <td style="width: 10%">数 量</td>
-                        <td style="width: 10%">单 价</td>
+                        <td style="width: 10%">单 价(含税)</td>
-                        <td style="width: 16%">金 额</td>
+                        <td style="width: 16%">金 额(不含税)</td>
-                        <td style="width: 7%">税率</td>
+                        <td style="width: 7%">税率%</td>
-                        <td style="width: 16%; border-right: none;">税 额</td>
+                        <td style="width: 16%; border-right: none">税 额</td>
                      </tr>
                    </thead>
-                    <tbody class="invoice-list" style="height: 126px;">
+                    <tbody class="invoice-list" style="height: 126px">
                      <tr>
-                        <td><span>*乳制品*新希望天香透明</span></td>
+                        <td>
-                        <td><span>180ML</span></td>
+                          <span>{{fncInvoiceItemList[0]?fncInvoiceItemList[0].objectName:""}}</span>
-                        <td><span>袋</span></td>
+                        </td>
-                        <td><span>5</span></td>
+                        <td><span>{{fncInvoiceItemList[0]?fncInvoiceItemList[0].specs:""}}</span>
-                        <td><span>2.364</span></td>
+                        </td>
-                        <td><span>11.82</span></td>
+                        <td><span>{{fncInvoiceItemList[0]?fncInvoiceItemList[0].unit:""}}</span>
-                        <td><span>1%</span></td>
+                        </td>
-                        <td><span>1.18</span></td>
+                        <td><span>{{fncInvoiceItemList[0]?fncInvoiceItemList[0].quantity:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[0]?fncInvoiceItemList[0].unitPriceTax:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[0]?(fncInvoiceItemList[0].quantity*fncInvoiceItemList[0].unitPriceTax/(1+fncInvoiceItemList[0].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
+                        <!-- <td><span>{{fncInvoiceItemList[0]?fncInvoiceItemList[0].amountNoTax:""}}</span></td> -->
+                        <td><span>{{fncInvoiceItemList[0]?fncInvoiceItemList[0].taxRate:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[0]?(fncInvoiceItemList[0].quantity*fncInvoiceItemList[0].unitPriceTax/(1+fncInvoiceItemList[0].taxRate/100)*(fncInvoiceItemList[0].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
                      </tr>
                      <tr>
-                        <td><span>新希望天香透明袋纯牛奶</span></td>
+                        <td>
-                        <td><span>180ML</span></td>
+                          <span>{{fncInvoiceItemList[1]?fncInvoiceItemList[1].objectName:""}}</span>
-                        <td><span>袋</span></td>
+                        </td>
-                        <td><span>5</span></td>
+                        <td><span>{{fncInvoiceItemList[1]?fncInvoiceItemList[1].specs:""}}</span>
-                        <td><span>2.364</span></td>
+                        </td>
-                        <td><span>11.82</span></td>
+                        <td><span>{{fncInvoiceItemList[1]?fncInvoiceItemList[1].unit:""}}</span>
-                        <td><span>1%</span></td>
+                        </td>
-                        <td><span>1.18</span></td>
+                        <td><span>{{fncInvoiceItemList[1]?fncInvoiceItemList[1].quantity:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[1]?fncInvoiceItemList[1].unitPriceTax:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[1]?(fncInvoiceItemList[1].quantity*fncInvoiceItemList[1].unitPriceTax/(1+fncInvoiceItemList[1].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
+                        <td><span>{{fncInvoiceItemList[1]?fncInvoiceItemList[1].taxRate:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[1]?(fncInvoiceItemList[1].quantity*fncInvoiceItemList[1].unitPriceTax/(1+fncInvoiceItemList[1].taxRate/100)*(fncInvoiceItemList[1].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
                      </tr>
                      <tr>
-                        <td><span>新希望天香透明袋纯牛奶</span></td>
+                        <td>
-                        <td><span>180ML</span></td>
+                          <span>{{fncInvoiceItemList[2]?fncInvoiceItemList[2].objectName:""}}</span>
-                        <td><span>袋</span></td>
+                        </td>
-                        <td><span>5</span></td>
+                        <td><span>{{fncInvoiceItemList[2]?fncInvoiceItemList[2].specs:""}}</span>
-                        <td><span>2.364</span></td>
+                        </td>
-                        <td><span>11.82</span></td>
+                        <td><span>{{fncInvoiceItemList[2]?fncInvoiceItemList[2].unit:""}}</span>
-                        <td><span>1%</span></td>
+                        </td>
-                        <td><span>1.18</span></td>
+                        <td><span>{{fncInvoiceItemList[2]?fncInvoiceItemList[2].quantity:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[2]?fncInvoiceItemList[2].unitPriceTax:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[2]?(fncInvoiceItemList[2].quantity*fncInvoiceItemList[2].unitPriceTax/(1+fncInvoiceItemList[2].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
+                        <td><span>{{fncInvoiceItemList[2]?fncInvoiceItemList[2].taxRate:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[2]?(fncInvoiceItemList[2].quantity*fncInvoiceItemList[2].unitPriceTax/(1+fncInvoiceItemList[2].taxRate/100)*(fncInvoiceItemList[1].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
                      </tr>
                      <tr>
-                        <td><span>新希望天香透明袋纯牛奶</span></td>
+                        <td>
-                        <td><span>180ML</span></td>
+                          <span>{{fncInvoiceItemList[3]?fncInvoiceItemList[3].objectName:""}}</span>
-                        <td><span>袋</span></td>
+                        </td>
-                        <td><span>5</span></td>
+                        <td><span>{{fncInvoiceItemList[3]?fncInvoiceItemList[3].specs:""}}</span>
-                        <td><span>2.364</span></td>
+                        </td>
-                        <td><span>11.82</span></td>
+                        <td><span>{{fncInvoiceItemList[3]?fncInvoiceItemList[3].unit:""}}</span>
-                        <td><span>1%</span></td>
+                        </td>
-                        <td><span>1.18</span></td>
+                        <td><span>{{fncInvoiceItemList[3]?fncInvoiceItemList[3].quantity:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[3]?fncInvoiceItemList[3].unitPriceTax:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[3]?(fncInvoiceItemList[3].quantity*fncInvoiceItemList[3].unitPriceTax/(1+fncInvoiceItemList[3].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
+                        <td><span>{{fncInvoiceItemList[3]?fncInvoiceItemList[3].taxRate:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[3]?(fncInvoiceItemList[3].quantity*fncInvoiceItemList[3].unitPriceTax/(1+fncInvoiceItemList[3].taxRate/100)*(fncInvoiceItemList[3].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
                      </tr>
                      <tr>
-                        <td><span>新希望天香透明袋纯牛奶</span></td>
+                        <td>
-                        <td><span>180ML</span></td>
+                          <span>{{fncInvoiceItemList[4]?fncInvoiceItemList[4].objectName:""}}</span>
-                        <td><span>袋</span></td>
+                        </td>
-                        <td><span>5</span></td>
+                        <td><span>{{fncInvoiceItemList[4]?fncInvoiceItemList[4].specs:""}}</span>
-                        <td><span>2.364</span></td>
+                        </td>
-                        <td><span>11.82</span></td>
+                        <td><span>{{fncInvoiceItemList[4]?fncInvoiceItemList[4].unit:""}}</span>
-                        <td><span>1%</span></td>
+                        </td>
-                        <td><span>1.18</span></td>
+                        <td><span>{{fncInvoiceItemList[4]?fncInvoiceItemList[4].quantity:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[4]?fncInvoiceItemList[4].unitPriceTax:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[4]?(fncInvoiceItemList[4].quantity*fncInvoiceItemList[4].unitPriceTax/(1+fncInvoiceItemList[4].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
+                        <td><span>{{fncInvoiceItemList[4]?fncInvoiceItemList[4].taxRate:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[4]?(fncInvoiceItemList[4].quantity*fncInvoiceItemList[4].unitPriceTax/(1+fncInvoiceItemList[4].taxRate/100)*(fncInvoiceItemList[4].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
                      </tr>
                      <tr>
-                        <td><span>新希望天香透明袋纯牛奶</span></td>
+                        <td>
-                        <td><span>180ML</span></td>
+                          <span>{{fncInvoiceItemList[5]?fncInvoiceItemList[5].objectName:""}}</span>
-                        <td><span>袋</span></td>
+                        </td>
-                        <td><span>5</span></td>
+                        <td><span>{{fncInvoiceItemList[5]?fncInvoiceItemList[5].specs:""}}</span>
-                        <td><span>2.364</span></td>
+                        </td>
-                        <td><span>11.82</span></td>
+                        <td><span>{{fncInvoiceItemList[5]?fncInvoiceItemList[5].unit:""}}</span>
-                        <td><span>1%</span></td>
+                        </td>
-                        <td><span>1.18</span></td>
+                        <td><span>{{fncInvoiceItemList[5]?fncInvoiceItemList[5].quantity:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[5]?fncInvoiceItemList[5].unitPriceTax:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[5]?(fncInvoiceItemList[5].quantity*fncInvoiceItemList[5].unitPriceTax/(1+fncInvoiceItemList[5].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
+                        <td><span>{{fncInvoiceItemList[5]?fncInvoiceItemList[5].taxRate:""}}</span>
+                        </td>
+                        <td>
+                          <span>{{fncInvoiceItemList[5]?(fncInvoiceItemList[5].quantity*fncInvoiceItemList[5].unitPriceTax/(1+fncInvoiceItemList[5].taxRate/100)*(fncInvoiceItemList[5].taxRate/100)).toFixed(2):""}}</span>
+                        </td>
                      </tr>
                    </tbody>
                    <tfoot>
                      <tr class="total">
                        <td>合 &nbsp;&nbsp;&nbsp;计</td>
                        <td></td>
                        <td></td>
                        <td></td>
                        <td></td>
-                        <td><span class="rmb">￥</span>1425.00</td>
+                        <td><span class="rmb">￥</span>{{Accsum}}</td>
                        <td></td>
-                        <td><span class="rmb">￥</span>1425.00</td>
+                        <td><span class="rmb">￥</span>{{taxsum}}</td>
                      </tr>
                      <tr class="GoodsTotal">
                        <td>价税合计(大写)</td>
                        <td colspan="7">
-                          <div style="width: 100%;display:flex">
+                          <div style="width: 100%; display: flex">
-                            <div type="text" style="width: 60%"><span class='c-black'>ⓧ壹万叁仟元整</span>
+                            <div type="text" style="width: 60%">
+                              <span class="c-black">ⓧ{{form.amountTaxCapital}}</span>
                            </div>
-                            <div type="text" style="width: 30%"> (小写) <span class='c-black'><span
+                            <div type="text" style="width: 30%">
-                                  class="rmb">￥</span>1425.00</span></div>
+                              (小写)
+                              <span class="c-black"><span class="rmb">￥</span>{{Numprice}}</span>
+                            </div>
                          </div>
                        </td>
                      </tr>
                    </tfoot>
@@ -557,49 +694,38 @@
                    <div class="buy">销售方</div>
                    <ul>
                      <li>
-                        <label>名&nbsp;&nbsp;&nbsp;&nbsp;称：</label><span>山东济南网络信息技术有限公司</span>
+                        <label>名&nbsp;&nbsp;&nbsp;&nbsp;称：</label><span>{{form.saleName}}</span>
                      </li>
                      <li>
-                        <label>纳税人识别号：</label><span class="f-big">913564523596023930</span>
+                        <label>纳税人识别号：</label><span class="f-big">{{form.saleTaxpayerNo}}</span>
                      </li>
                      <li>
-                        <label>地址、&nbsp;电话：</label><span class="f-small2">山东省济南市槐荫区经十路28988号乐梦公寓3号楼1单元605号
+                        <label>地址、&nbsp;电话：</label><span class="f-small2">{{form.saleAddress}}
-                          0531-87527787</span>
+                          {{form.salePhone}}</span>
                      </li>
                      <li>
-                        <label>开户行及账号：</label><span class="f-small">中国银行股份有限公司济南大学科技园支行
+                        <label>开户行及账号：</label><span class="f-small">{{form.saleBankDeposit}}
-                          6225885410839945</span>
+                          {{form.saleBankAccount}}</span>
                      </li>
                    </ul>
                    <div class="password">备注</div>
-                    <div class="pwdInfo">aaa</div>
+                    <div class="pwdInfo">{{form.note}}</div>
                  </div>
                </div>
              </div>
              <!-- invoice body start -->
              <ul class="invoicetFooter">
-                <li>
+                <li><label>收款人：</label><span>{{form.payee}}</span></li>
-                  <label>收款人：</label><span>张莫某</span>
+                <li><label>复核：</label><span>{{form.reviewer}}</span></li>
-                </li>
+                <li><label>开票人：</label><span>{{form.drawer}}</span></li>
-                <li>
-                  <label>复核：</label><span>张莫某</span>
-                </li>
-                <li>
-                  <label>开票人：</label><span>张莫某</span>
-                </li>
                <li>
                  <label>销售方：（章）</label>
                </li>
              </ul>
            </div>
          </body>
        </el-col>
      </el-row>
    </el-drawer>
  </div>
 </template>
@@ -622,8 +748,37 @@ import {
 } from "@/api/finance/company";
 export default {
  name: "Invoice",
+  filters: {
+    typeFilter(value,this_) {
+      if(!value) {
+        return ""
+      }
+     return this_.invoiceTypeList.find((item, index, array) => {
+        return item.value == value
+      }).label
+    },
+    natureFilter(value,this_) {
+      if(!value) {
+        return ""
+      }
+      return this_.invoiceNatureList.find((item, index, array) => {
+        return item.value == value
+      }).label
+    },
+  },
  data() {
    return {
+      this_:this,
+      //发票类型
+      invoiceTypeList: [
+        { label: "普通发票", value: "0" },
+        { label: "增值税专用发票", value: "1" },
+      ],
+      //发票性质
+      invoiceNatureList: [
+        { label: "进项", value: "0" },
+        { label: "出项", value: "1" },
+      ],
      // 根路径
      baseURL: process.env.VUE_APP_BASE_API,
      // 遮罩层
@@ -650,9 +805,7 @@ export default {
      title: "",
      // 是否显示弹出层
      open: false,
-      //发票类型
-      invoiceTypeList: [{ label: "普通发票", value: 0 }, { label: "增值税专用发票", value: 1 }],
-      invoiceNatureList: [{ label: "进项", value: 0 }, { label: "出项", value: 1 }],
      // 查询参数
      queryParams: {
        pageNum: 1,
@@ -706,7 +859,7 @@ export default {
        invoiceNature: [
          {
            required: true,
-            message: "发票性质  (0:进项，1:出项）不能为空",
+            message: "发票性质不能为空",
            trigger: "blur",
          },
        ],
@@ -808,8 +961,72 @@ export default {
    this.getList();
    this.getCompanyList();
  },
-  methods: {
+  //算法公式
+  computed: {
+    //金额(不含税)
+    //     price1(){
+    //       let sum=this.in
+    // (fncInvoiceItemList[0].quantity*fncInvoiceItemList[0].unitPriceTax/(1+fncInvoiceItemList[0].taxRate/100)).toFixed(2)
+    //     },
+    //合计金额（不含税）
+    Accsum() {
+      let price = 0;
+      for (var i = 0; i < this.fncInvoiceItemList.length; i++) {
+        price =
+          price +
+          (this.fncInvoiceItemList[i].quantity *
+            this.fncInvoiceItemList[i].unitPriceTax) /
+            (1 + this.fncInvoiceItemList[i].taxRate / 100);
+      }
+      price = price.toFixed(2);
+      this.form.amountSum = price;
+      return price;
+    },
+    //税额合计
+    taxsum() {
+      let sum = 0;
+      for (var i = 0; i < this.fncInvoiceItemList.length; i++) {
+        sum =
+          sum +
+          ((this.fncInvoiceItemList[i].quantity *
+            this.fncInvoiceItemList[i].unitPriceTax) /
+            (1 + this.fncInvoiceItemList[i].taxRate / 100)) *
+            (this.fncInvoiceItemList[i].taxRate / 100);
+      }
+      sum = sum.toFixed(2);
+      this.form.taxSum = sum;
+      return sum;
+    },
+    //价税合计
+    Numprice() {
+      let qwe = 0;
+      for (var i = 0; i < this.fncInvoiceItemList.length; i++) {
+        qwe =
+          qwe +
+          (this.fncInvoiceItemList[i].quantity *
+            this.fncInvoiceItemList[i].unitPriceTax) /
+            (1 + this.fncInvoiceItemList[i].taxRate / 100) +
+          ((this.fncInvoiceItemList[i].quantity *
+            this.fncInvoiceItemList[i].unitPriceTax) /
+            (1 + this.fncInvoiceItemList[i].taxRate / 100)) *
+            (this.fncInvoiceItemList[i].taxRate / 100);
+      }
+      qwe = qwe.toFixed(2);
+      this.form.amountTaxLower = qwe;
+      return qwe;
+    },
+  },
+  methods: {
+    /** 公司列表下拉框改变 */
+    changeCompany(item) {
+      console.log(item);
+      this.form.companyId = item.companyId;
+      this.form.companyName = item.companyName;
+    },
    /** 查询公司列表 */
    getCompanyList() {
      this.loading = true;
@@ -934,7 +1151,7 @@ export default {
          this.getList();
          this.$modal.msgSuccess("删除成功");
        })
-        .catch(() => { });
+        .catch(() => {});
    },
    /** 发票项序号 */
    rowFncInvoiceItemIndex({ row, rowIndex }) {
@@ -968,6 +1185,7 @@ export default {
    },
    /** 复选框选中数据 */
    handleFncInvoiceItemSelectionChange(selection) {
+      console.log(this.fncInvoiceItemList[0].invoiceId);
      this.checkedFncInvoiceItem = selection.map((item) => item.index);
    },
    /** 导出按钮操作 */
@@ -1001,6 +1219,51 @@ ul li {
 body {
  font-family: "simsun";
+  position: fixed;
+  top: 10;
+  right: 5;
+}
+.title {
+  margin: auto;
+  width: 100%;
+  text-align: center;
+  display: flex;
+}
+.companyname {
+  text-align: center;
+  height: 40px;
+  line-height: 40px;
+  font-size: 25px;
+  color: green;
+  margin-bottom: 10px;
+}
+.neck {
+  display: flex;
+  height: 40px;
+  border: 1px solid green;
+  margin-bottom: 10px;
+  color: green;
+  overflow: hidden;
+}
+.neck span {
+  line-height: 40px;
+  margin: 0 10px;
+}
+.neck input {
+  height: 35px;
+  width: 120px;
+  border: 0;
+  outline: none;
+}
+.neck .department {
+  flex: 3;
+}
+.neck .applicant {
+  flex: 3;
+}
+.neck .date {
+  flex: 3;
 }
 label {
@@ -1081,10 +1344,10 @@ label {
  letter-spacing: 1px;
 }
-.headerRight {
+/* .headerRight {
  padding-left: 28px;
  width: 316px;
-}
+} */
 .headerRight p:nth-child(1) {
  font-size: 24px;
@@ -1113,8 +1376,9 @@ label {
 }
 .headerMiddle {
-  text-align: center;
  width: 300px;
+  margin: auto;
+  text-align: right;
 }
 .headerMiddle h1 {
@@ -1122,7 +1386,15 @@ label {
  color: #008000;
  padding-bottom: 22px;
 }
+.headerRight {
+  width: 300px;
+  margin: auto;
+}
+.headerRight h1 {
+  font-size: 32px;
+  color: #008000;
+  padding-bottom: 22px;
+}
 .total .rmb {
  font-size: 16px;
 }
@@ -1134,10 +1406,6 @@ label {
  margin-bottom: 30px;
 }
-.headerRight li {
-  line-height: 24px;
-}
 .invoiceBody {
  border: 1px solid #008000;
 }
@@ -1202,12 +1470,12 @@ label {
 }
 .pwdInfo {
-  flex: 1;
+  /* flex: 1; */
-  padding: 0 15px;
+  padding: 0;
-  height: 88px;
+  height: 100%;
-  overflow: hidden;
+  width: 50%;
-  word-break: break-all;
-  letter-spacing: 2px;
+  overflow: auto;
 }
 .goodsInfo {
@@ -1342,7 +1610,6 @@ label {
 }
 .element::-webkit-scrollbar {
-  display: none
+  display: none;
 }
 </style>
--- a/ruoyi-ui/src/views/finance/ledger/index.vue
+++ b/ruoyi-ui/src/views/finance/ledger/index.vue
@@ -179,6 +179,7 @@ import {
 import { getToken } from "@/utils/auth";
 export default {
  name: "Ledger",
  data() {
    return {
      // 遮罩层

--- a/sql/ry-vue.sql
+++ b/sql/ry-vue.sql
 /*
 Navicat Premium Data Transfer
- Source Server         : localhost_3306
+ Source Server         : 192.168.182.130-mysql
 Source Server Type    : MySQL
- Source Server Version : 50736
+ Source Server Version : 50738
- Source Host           : localhost:3306
+ Source Host           : 192.168.182.130:3306
 Source Schema         : ry-vue
 Target Server Type    : MySQL
- Target Server Version : 50736
+ Target Server Version : 50738
 File Encoding         : 65001
- Date: 21/11/2022 17:29:25
+ Date: 22/11/2022 23:12:17
 */
 SET NAMES utf8mb4;
@@ -31,11 +31,11 @@ CREATE TABLE `fnc_company`  (
  `bank_account_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行账户名称',
  `bank_account` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行账户',
  `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`company_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '记账公司表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '记账公司表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of fnc_company
@@ -58,7 +58,7 @@ CREATE TABLE `fnc_invoice`  (
  `buy_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '购买方名称',
  `buy_taxpayer_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '购买方纳税人识别号',
  `buy_address` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '购买方地址',
-  `buy_phone` varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '购买方电话',
+  `buy_phone` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '购买方电话',
  `buy_bank_deposit` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '购买方开户行',
  `buy_bank_account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '购买方银行账号',
  `applicant` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '申请人',
@@ -79,15 +79,16 @@ CREATE TABLE `fnc_invoice`  (
  `reviewer` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '复核人',
  `drawer` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开票人',
  `create_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`invoice_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发票' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发票' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of fnc_invoice
 -- ----------------------------
+INSERT INTO `fnc_invoice` VALUES (1, 1, '上海让雷智能科技有限公司', 1, 0, '研发部', '2022-11-22', '上海让雷', '36598', '上海', '15070928782', '中国银行', '5547399741', '李斌', '张三', '2248', 86051.800000, 5274.200000, '捌万零伍拾壹八角', 91326.000000, '淘宝', '25748', '台北', '15789692364', '浦发银行', '554892', '无', '李斌', '张丽霞', '张三', 'admin', '2022-11-22 23:07:01', 'admin', '2022-11-22 23:07:01');
 -- ----------------------------
 -- Table structure for fnc_invoice_item
@@ -105,15 +106,17 @@ CREATE TABLE `fnc_invoice_item`  (
  `tax_rate` decimal(5, 3) NULL DEFAULT NULL COMMENT '税率',
  `tax_amount` decimal(21, 6) NULL DEFAULT NULL COMMENT '税额',
  `create_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`invoice_item_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发票项' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发票项' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of fnc_invoice_item
 -- ----------------------------
+INSERT INTO `fnc_invoice_item` VALUES (1, 1, '华为手机', 'Mate 40', '台', 5.000000, 6999.000000, NULL, 3.250, NULL, 'admin', '2022-11-22 23:07:01', 'admin', '2022-11-22 23:07:01');
+INSERT INTO `fnc_invoice_item` VALUES (2, 1, '苹果电脑', 'M2', '台', 3.000000, 18777.000000, NULL, 8.000, NULL, 'admin', '2022-11-22 23:07:01', 'admin', '2022-11-22 23:07:01');
 -- ----------------------------
 -- Table structure for fnc_ledger
@@ -132,11 +135,11 @@ CREATE TABLE `fnc_ledger`  (
  `business_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务性质',
  `sale_evaluation` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售额评估',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`ledger_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 16760 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目台账' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 16760 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目台账' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of fnc_ledger
@@ -2425,29 +2428,6 @@ INSERT INTO `fnc_ledger` VALUES (16757, '全系列', '2022-11-15', '杭州耀恒
 INSERT INTO `fnc_ledger` VALUES (16758, '全系列', '2022-11-15', '山东品派无纺布制品有限公司', '孙凌云', '13361520666', '20221115', '李小龙', '山东品派无纺布制品有限公司', '内贸', '0万', 'admin', '2022-11-16 22:14:51', 'admin', '2022-11-16 22:14:51');
 INSERT INTO `fnc_ledger` VALUES (16759, '全系列', '2022-11-15', '泉州瑞尔无纺布有限公司', '陈燕瑞', '13905058650', '20221115', '李小龙', '泉州瑞尔无纺布有限公司', '内贸', '0万', 'admin', '2022-11-16 22:14:51', 'admin', '2022-11-16 22:14:51');
-- ----------------------------
-- Table structure for fnc_subject
-- ----------------------------
-DROP TABLE IF EXISTS `fnc_subject`;
-CREATE TABLE `fnc_subject`  (
-  `subject_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '科目id',
-  `subject_type_id` bigint(20) NOT NULL COMMENT '科目类别id',
-  `code` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码',
-  `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '科目名称',
-  `full_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '科目全称',
-  `order_num` int(4) NULL DEFAULT NULL COMMENT '显示顺序',
-  `delete_status` int(4) NULL DEFAULT NULL COMMENT '是否删除 1否 2已删除',
-  `create_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`subject_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '科目表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of fnc_subject
-- ----------------------------
 -- ----------------------------
 -- Table structure for fnc_subject_type
 -- ----------------------------
@@ -2458,12 +2438,12 @@ CREATE TABLE `fnc_subject_type`  (
  `subject_type_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '科目类别名称',
  `order_num` int(4) NULL DEFAULT NULL COMMENT '显示顺序',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `delete_status` int(4) NULL DEFAULT NULL COMMENT '是否删除',
  PRIMARY KEY (`subject_type_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '科目类别' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '科目类别' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of fnc_subject_type
@@ -2498,12 +2478,12 @@ CREATE TABLE `gen_table`  (
  `gen_path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '/' COMMENT '生成路径（不填默认项目路径）',
  `options` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其它生成选项',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`table_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of gen_table
@@ -2538,11 +2518,11 @@ CREATE TABLE `gen_table_column`  (
  `dict_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典类型',
  `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`column_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 260 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 260 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of gen_table_column
@@ -2643,12 +2623,12 @@ CREATE TABLE `sys_config`  (
  `config_value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '参数键值',
  `config_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '系统内置（Y是 N否）',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`config_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数配置表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数配置表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_config
@@ -2675,11 +2655,11 @@ CREATE TABLE `sys_dept`  (
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '部门状态（0正常 1停用）',
  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`dept_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 201 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 201 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_dept
@@ -2711,12 +2691,12 @@ CREATE TABLE `sys_dict_data`  (
  `is_default` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '是否默认（Y是 N否）',
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`dict_code`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 102 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典数据表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 102 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典数据表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_dict_data
@@ -2763,13 +2743,13 @@ CREATE TABLE `sys_dict_type`  (
  `dict_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典类型',
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`dict_id`) USING BTREE,
  UNIQUE INDEX `dict_type`(`dict_type`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 101 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典类型表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 101 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典类型表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_dict_type
@@ -2800,12 +2780,12 @@ CREATE TABLE `sys_job`  (
  `concurrent` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '是否并发执行（0允许 1禁止）',
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1暂停）',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注信息',
  PRIMARY KEY (`job_id`, `job_name`, `job_group`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_job
@@ -2826,9 +2806,9 @@ CREATE TABLE `sys_job_log`  (
  `job_message` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日志信息',
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '执行状态（0正常 1失败）',
  `exception_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '异常信息',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  PRIMARY KEY (`job_log_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度日志表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度日志表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_job_log
@@ -2847,9 +2827,9 @@ CREATE TABLE `sys_logininfor`  (
  `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '操作系统',
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '登录状态（0成功 1失败）',
  `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '提示消息',
-  `login_time` datetime(0) NULL DEFAULT NULL COMMENT '访问时间',
+  `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间',
  PRIMARY KEY (`info_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 139 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 140 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_logininfor
@@ -2891,8 +2871,9 @@ INSERT INTO `sys_logininfor` VALUES (133, 'admin', '127.0.0.1', '内网IP', 'Chr
 INSERT INTO `sys_logininfor` VALUES (134, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-20 02:15:37');
 INSERT INTO `sys_logininfor` VALUES (135, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-20 06:24:54');
 INSERT INTO `sys_logininfor` VALUES (136, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-20 07:28:40');
-INSERT INTO `sys_logininfor` VALUES (137, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-21 09:37:21');
+INSERT INTO `sys_logininfor` VALUES (137, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-22 13:51:27');
-INSERT INTO `sys_logininfor` VALUES (138, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-21 16:18:49');
+INSERT INTO `sys_logininfor` VALUES (138, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '退出成功', '2022-11-22 14:19:36');
+INSERT INTO `sys_logininfor` VALUES (139, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-22 14:19:40');
 -- ----------------------------
 -- Table structure for sys_menu
@@ -2914,12 +2895,12 @@ CREATE TABLE `sys_menu`  (
  `perms` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限标识',
  `icon` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '#' COMMENT '菜单图标',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注',
  PRIMARY KEY (`menu_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2028 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 2028 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单权限表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_menu
@@ -3047,12 +3028,12 @@ CREATE TABLE `sys_notice`  (
  `notice_content` longblob NULL COMMENT '公告内容',
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '公告状态（0正常 1关闭）',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`notice_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '通知公告表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '通知公告表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_notice
@@ -3080,9 +3061,9 @@ CREATE TABLE `sys_oper_log`  (
  `json_result` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '返回参数',
  `status` int(1) NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）',
  `error_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '错误消息',
-  `oper_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
+  `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间',
  PRIMARY KEY (`oper_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 205 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 204 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_oper_log
@@ -3189,9 +3170,8 @@ INSERT INTO `sys_oper_log` VALUES (198, '代码生成', 2, 'com.ruoyi.generator.
 INSERT INTO `sys_oper_log` VALUES (199, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/tool/gen', '127.0.0.1', '内网IP', '{\"businessName\":\"invoice\",\"className\":\"FncInvoice\",\"columns\":[{\"capJavaField\":\"InvoiceId\",\"columnComment\":\"发票id\",\"columnId\":211,\"columnName\":\"invoice_id\",\"columnType\":\"bigint(20)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-20 02:16:10\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":true,\"insert\":true,\"isIncrement\":\"1\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"invoiceId\",\"javaType\":\"Long\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":21,\"updateBy\":\"\",\"updateTime\":\"2022-11-20 02:27:35\",\"usableColumn\":false},{\"capJavaField\":\"CompanyId\",\"columnComment\":\"公司id\",\"columnId\":212,\"columnName\":\"company_id\",\"columnType\":\"bigint(20)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-20 02:16:10\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"javaField\":\"companyId\",\"javaType\":\"Long\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":21,\"updateBy\":\"\",\"updateTime\":\"2022-11-20 02:27:35\",\"usableColumn\":false},{\"capJavaField\":\"CompanyName\",\"columnComment\":\"公司名称\",\"columnId\":259,\"columnName\":\"company_name\",\"columnType\":\"varchar(40)\",\"createBy\":\"\",\"createTime\":\"2022-11-20 02:27:35\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"javaField\":\"companyName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":false,\"sort\":3,\"superColumn\":false,\"tableId\":21,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"InvoiceType\",\"columnComment\":\"发票类型（0:普通发票，1:增值税专用发票）\",\"columnId\":214,\"columnName\":\"invoice_type\",\"columnType\":\"int(4)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-20 02:16:10\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"select\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-20 02:37:40');
 INSERT INTO `sys_oper_log` VALUES (200, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{}', NULL, 0, NULL, '2022-11-20 02:38:30');
 INSERT INTO `sys_oper_log` VALUES (201, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/tool/gen', '127.0.0.1', '内网IP', '{\"businessName\":\"invoice\",\"className\":\"FncInvoice\",\"columns\":[{\"capJavaField\":\"InvoiceId\",\"columnComment\":\"发票id\",\"columnId\":211,\"columnName\":\"invoice_id\",\"columnType\":\"bigint(20)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-20 02:16:10\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":true,\"insert\":true,\"isIncrement\":\"1\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"invoiceId\",\"javaType\":\"Long\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":21,\"updateBy\":\"\",\"updateTime\":\"2022-11-20 02:37:40\",\"usableColumn\":false},{\"capJavaField\":\"CompanyId\",\"columnComment\":\"公司id\",\"columnId\":212,\"columnName\":\"company_id\",\"columnType\":\"bigint(20)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-20 02:16:10\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"javaField\":\"companyId\",\"javaType\":\"Long\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"EQ\",\"required\":false,\"sort\":2,\"superColumn\":false,\"tableId\":21,\"updateBy\":\"\",\"updateTime\":\"2022-11-20 02:37:40\",\"usableColumn\":false},{\"capJavaField\":\"CompanyName\",\"columnComment\":\"公司名称\",\"columnId\":259,\"columnName\":\"company_name\",\"columnType\":\"varchar(40)\",\"createBy\":\"\",\"createTime\":\"2022-11-20 02:27:35\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"javaField\":\"companyName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":false,\"sort\":3,\"superColumn\":false,\"tableId\":21,\"updateBy\":\"\",\"updateTime\":\"2022-11-20 02:37:40\",\"usableColumn\":false},{\"capJavaField\":\"InvoiceType\",\"columnComment\":\"发票类型（0:普通发票，1:增值税专用发票）\",\"columnId\":214,\"columnName\":\"invoice_type\",\"columnType\":\"int(4)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-20 02:16:10\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\"', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-20 03:06:16');
-INSERT INTO `sys_oper_log` VALUES (202, '科目类别', 3, 'com.ruoyi.web.controller.finance.FncSubjectTypeController.remove()', 'GET', 1, 'admin', NULL, '/finance/subjectType/remove/5', '127.0.0.1', '内网IP', '{subjectTypeIds=5}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-21 16:35:11');
+INSERT INTO `sys_oper_log` VALUES (202, '发票', 1, 'com.ruoyi.system.controller.FncInvoiceController.add()', 'POST', 1, 'admin', NULL, '/finance/invoice/add', '127.0.0.1', '内网IP', '{\"amountSum\":86051.80,\"amountTaxCapital\":\"捌万零伍拾壹八角\",\"amountTaxLower\":91326.00,\"applicant\":\"李斌\",\"buyAddress\":\"上海\",\"buyBankAccount\":\"5547399741\",\"buyBankDeposit\":\"中国银行\",\"buyName\":\"上海让雷\",\"buyPhone\":\"15070928782\",\"buyTaxpayerNo\":\"36598\",\"checker\":\"张三\",\"companyId\":1,\"companyName\":\"上海让雷智能科技有限公司\",\"createBy\":\"admin\",\"createTime\":\"2022-11-22T23:05:33.387+08:00\",\"depName\":\"研发部\",\"drawer\":\"张三\",\"fncInvoiceItemList\":[{\"objectName\":\"华为手机\",\"params\":{},\"quantity\":5,\"specs\":\"Mate 40\",\"taxRate\":3.25,\"unit\":\"台\",\"unitPriceTax\":6999},{\"objectName\":\"苹果电脑\",\"params\":{},\"quantity\":3,\"specs\":\"M2\",\"taxRate\":8,\"unit\":\"台\",\"unitPriceTax\":18777}],\"invoiceDate\":\"2022-11-22 00:00:00\",\"invoiceNature\":0,\"invoiceType\":1,\"note\":\"无\",\"params\":{},\"payee\":\"李斌\",\"projectOrInvoiceNo\":\"2248\",\"reviewer\":\"张丽霞\",\"saleAddress\":\"台北\",\"saleBankAccount\":\"554892\",\"saleBankDeposit\":\"浦发银行\",\"saleName\":\"淘宝\",\"salePhone\":\"15789692364\",\"saleTaxpayerNo\":\"25748\",\"taxSum\":5274.20,\"updateBy\":\"admin\",\"updateTime\":\"2022-11-22T23:05:33.387+08:00\"}', NULL, 1, '\r\n### Error updating database.  Cause: com.mysql.cj.jdbc.exceptions.MysqlDataTruncation: Data truncation: Data too long for column \'buy_phone\' at row 1\r\n### The error may exist in com/ruoyi/system/mapper/FncInvoiceMapper.java (best guess)\r\n### The error may involve com.ruoyi.system.mapper.FncInvoiceMapper.insert-Inline\r\n### The error occurred while setting parameters\r\n### SQL: INSERT INTO fnc_invoice  ( company_id, company_name, invoice_type, invoice_nature, dep_name, invoice_date, buy_name, buy_taxpayer_no, buy_address, buy_phone, buy_bank_deposit, buy_bank_account, applicant, checker, project_or_invoice_no, amount_sum, tax_sum, amount_tax_capital, amount_tax_lower, sale_name, sale_taxpayer_no, sale_address, sale_phone, sale_bank_deposit, sale_bank_account, note, payee, reviewer, drawer, create_by, create_time, update_by, update_time )  VALUES  ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )\r\n### Cause: com.mysql.cj.jdbc.exceptions.MysqlDataTruncation: Data truncation: Data too long for column \'buy_phone\' at row 1\n; Data truncation: Data too long for column \'buy_phone\' at row 1; nested exception is com.mysql.cj.jdbc.exceptions.MysqlDataTruncation: Data truncation: Data too long for column \'buy_phone\' at row 1', '2022-11-22 15:05:34');
-INSERT INTO `sys_oper_log` VALUES (203, '菜单管理', 3, 'com.ruoyi.web.controller.system.SysMenuController.remove()', 'DELETE', 1, 'admin', NULL, '/system/menu/3', '127.0.0.1', '内网IP', '{menuId=3}', '{\"msg\":\"存在子菜单,不允许删除\",\"code\":601}', 0, NULL, '2022-11-21 16:38:08');
+INSERT INTO `sys_oper_log` VALUES (203, '发票', 1, 'com.ruoyi.system.controller.FncInvoiceController.add()', 'POST', 1, 'admin', NULL, '/finance/invoice/add', '127.0.0.1', '内网IP', '{\"amountSum\":86051.80,\"amountTaxCapital\":\"捌万零伍拾壹八角\",\"amountTaxLower\":91326.00,\"applicant\":\"李斌\",\"buyAddress\":\"上海\",\"buyBankAccount\":\"5547399741\",\"buyBankDeposit\":\"中国银行\",\"buyName\":\"上海让雷\",\"buyPhone\":\"15070928782\",\"buyTaxpayerNo\":\"36598\",\"checker\":\"张三\",\"companyId\":1,\"companyName\":\"上海让雷智能科技有限公司\",\"createBy\":\"admin\",\"createTime\":\"2022-11-22T23:07:01.139+08:00\",\"depName\":\"研发部\",\"drawer\":\"张三\",\"fncInvoiceItemList\":[{\"createBy\":\"admin\",\"createTime\":\"2022-11-22T23:07:01.161+08:00\",\"invoiceId\":1,\"invoiceItemId\":1,\"objectName\":\"华为手机\",\"params\":{},\"quantity\":5,\"specs\":\"Mate 40\",\"taxRate\":3.25,\"unit\":\"台\",\"unitPriceTax\":6999,\"updateBy\":\"admin\",\"updateTime\":\"2022-11-22T23:07:01.161+08:00\"},{\"createBy\":\"admin\",\"createTime\":\"2022-11-22T23:07:01.165+08:00\",\"invoiceId\":1,\"invoiceItemId\":2,\"objectName\":\"苹果电脑\",\"params\":{},\"quantity\":3,\"specs\":\"M2\",\"taxRate\":8,\"unit\":\"台\",\"unitPriceTax\":18777,\"updateBy\":\"admin\",\"updateTime\":\"2022-11-22T23:07:01.165+08:00\"}],\"invoiceDate\":\"2022-11-22 00:00:00\",\"invoiceId\":1,\"invoiceNature\":0,\"invoiceType\":1,\"note\":\"无\",\"params\":{},\"payee\":\"李斌\",\"projectOrInvoiceNo\":\"2248\",\"reviewer\":\"张丽霞\",\"saleAddress\":\"台北\",\"saleBankAccount\":\"554892\",\"saleBankDeposit\":\"浦发银行\",\"saleName\":\"淘宝\",\"salePhone\":\"15789692364\",\"saleTaxpayerNo\":\"25748\",\"taxSum\":5274.20,\"updateBy\":\"admin\",\"updateTime\":\"2022-11-22T23:07:01.139+08:00\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-22 15:07:02');
-INSERT INTO `sys_oper_log` VALUES (204, '科目类别', 3, 'com.ruoyi.web.controller.finance.FncSubjectTypeController.remove()', 'GET', 1, 'admin', NULL, '/finance/subjectType/remove/5', '127.0.0.1', '内网IP', '{subjectTypeIds=5}', '{\"msg\":\"存在子科目类别,不允许删除\",\"code\":601}', 0, NULL, '2022-11-21 16:47:11');
 -- ----------------------------
 -- Table structure for sys_post
@@ -3204,12 +3184,12 @@ CREATE TABLE `sys_post`  (
  `post_sort` int(4) NOT NULL COMMENT '显示顺序',
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '状态（0正常 1停用）',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`post_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '岗位信息表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '岗位信息表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_post
@@ -3234,12 +3214,12 @@ CREATE TABLE `sys_role`  (
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色状态（0正常 1停用）',
  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`role_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色信息表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色信息表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_role
@@ -3255,7 +3235,7 @@ CREATE TABLE `sys_role_dept`  (
  `role_id` bigint(20) NOT NULL COMMENT '角色ID',
  `dept_id` bigint(20) NOT NULL COMMENT '部门ID',
  PRIMARY KEY (`role_id`, `dept_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和部门关联表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和部门关联表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_role_dept
@@ -3272,7 +3252,7 @@ CREATE TABLE `sys_role_menu`  (
  `role_id` bigint(20) NOT NULL COMMENT '角色ID',
  `menu_id` bigint(20) NOT NULL COMMENT '菜单ID',
  PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_role_menu
@@ -3385,19 +3365,19 @@ CREATE TABLE `sys_user`  (
  `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）',
  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
  `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最后登录IP',
-  `login_date` datetime(0) NULL DEFAULT NULL COMMENT '最后登录时间',
+  `login_date` datetime NULL DEFAULT NULL COMMENT '最后登录时间',
  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`user_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '/profile/avatar/2022/11/16/blob_20221116131804A001.png', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-11-21 16:18:49', 'admin', '2022-11-16 09:26:25', '', '2022-11-21 16:18:49', '管理员');
+INSERT INTO `sys_user` VALUES (1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '/profile/avatar/2022/11/16/blob_20221116131804A001.png', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-11-22 22:19:39', 'admin', '2022-11-16 09:26:25', '', '2022-11-22 14:19:40', '管理员');
 INSERT INTO `sys_user` VALUES (2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$72XZlIXBNHqFzVMZlzMp7etQzpbmlM22MW1VWNw5q..el.zHjYtT6', '0', '0', '127.0.0.1', '2022-11-16 13:30:08', 'admin', '2022-11-16 09:26:25', 'admin', '2022-11-16 13:30:07', '测试员');
 -- ----------------------------
@@ -3408,7 +3388,7 @@ CREATE TABLE `sys_user_post`  (
  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
  `post_id` bigint(20) NOT NULL COMMENT '岗位ID',
  PRIMARY KEY (`user_id`, `post_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与岗位关联表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与岗位关联表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_user_post
@@ -3424,7 +3404,7 @@ CREATE TABLE `sys_user_role`  (
  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
  `role_id` bigint(20) NOT NULL COMMENT '角色ID',
  PRIMARY KEY (`user_id`, `role_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户和角色关联表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户和角色关联表' ROW_FORMAT = DYNAMIC;
 -- ----------------------------
 -- Records of sys_user_role