Merge remote-tracking branch 'origin/master'

baoshiwei

5 小时以前 e97b55310155a2dd691bd698a10295a4d867f60c

 ruoyi-plus-soybean/src/typings/api/qm.batch.api.d.ts

old mode 100644
new mode 100755
@@ -24,6 +24,8 @@
      eqpCode: string;
      /** 牌号 */
      matCode: string;
      /** 牌号 */
      matName: string;
      /** 判定依据代码 */
      judgeCode: string;
      /** 批次生成日期 */
@@ -113,6 +115,7 @@
      Pick<
        Api.Qm.Batch,
        | 'batchCode'
        | 'isflag'
        | 'typ'
        | 'eqpCode'
        | 'matCode'
@@ -120,6 +123,7 @@
        | 'flag'
        | 'toMesDate'
        | 'fromMesDate'
        | 'enabled'
        | 'deleted'
        | 'category'
        | 'state'