czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
SongZhang
2024-10-14 10:30:00 +08:00
parent 5a2c3f4208 e659d1f420
commit f01c6c0e3c
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/ShopPrintLogDTO.java
View File

@@ -40,9 +40,9 @@ public class ShopPrintLogDTO implements Serializable {
private String tablePrint; private String tablePrint;
@ApiModelProperty(value = "打印数量 c1m1^2=顾客+商家[2张] m1^1=商家[1张] c1^1顾客[1张] c2m1^3=顾客2+商家1[3张]") @ApiModelProperty(value = "打印数量 c1m1^2=顾客+商家[2张] m1^1=商家[1张] c1^1顾客[1张] c2m1^3=顾客2+商家1[3张]")
private String printQty; private String printQty;
@ApiModelProperty(value = "打印方式 normal-普通出单 one-一菜一品 callTicket-排队取号") @ApiModelProperty(value = "打印方式 all-全部打印 normal-仅打印结账单「前台」one-仅打印制作单「厨房」")
private String printMethod; private String printMethod;
@ApiModelProperty(value = "打印类型 JSON数组字符串数据 1-确认退款单 2-交班单 3-排队取号，如：[1,2,3]") @ApiModelProperty(value = "打印类型，JSON数组 refund-确认退款单 handover-交班单 queue-排队取号，如：['refund','handover','queue']")
private String printType; private String printType;
@ApiModelProperty(value = "打印票据 0-全部打印 1-仅厨房 2-仅前台") @ApiModelProperty(value = "打印票据 0-全部打印 1-仅厨房 2-仅前台")
private String printReceipt; private String printReceipt;

4
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/ShopPrinterDTO.java
View File

@@ -126,11 +126,11 @@ public class ShopPrinterDTO implements Serializable {
*/ */
private String printQty; private String printQty;
/** /**
* 打印方式 normal-普通出单 one-一菜一品 callTicket-排队取号 * 打印方式 all-全部打印 normal-仅打印结账单「前台」one-仅打印制作单「厨房」
*/ */
private String printMethod; private String printMethod;
/** /**
* 打印类型，JSON数组 1-确认退款单 2-交班单 3-排队取号 * 打印类型，JSON数组 refund-确认退款单 handover-交班单 queue-排队取号，如：['refund','handover','queue']
*/ */
private String printType; private String printType;
/** /**

4
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachineEntity.java
View File

@@ -59,11 +59,11 @@ public class TbPrintMachineEntity implements Serializable {
*/ */
private String printQty; private String printQty;
/** /**
* 打印方式 normal-普通出单 one-一菜一品 callTicket-排队取号 * 打印方式 all-全部打印 normal-仅打印结账单「前台」one-仅打印制作单「厨房」
*/ */
private String printMethod; private String printMethod;
/** /**
* 打印类型，JSON数组 1-确认退款单 2-交班单 3-排队取号 * 打印类型，JSON数组 refund-确认退款单 handover-交班单 queue-排队取号，如：['refund','handover','queue']
*/ */
private String printType; private String printType;
/** /**

4
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachineLogEntity.java
View File

@@ -64,11 +64,11 @@ public class TbPrintMachineLogEntity implements Serializable {
*/ */
private String printQty; private String printQty;
/** /**
* 打印方式 normal-普通出单 one-一菜一品 callTicket-排队取号 * 打印方式 all-全部打印 normal-仅打印结账单「前台」one-仅打印制作单「厨房」
*/ */
private String printMethod; private String printMethod;
/** /**
* 打印类型 JSON数组字符串数据 1-确认退款单 2-交班单 3-排队取号，如：[1,2,3] * 打印类型，JSON数组 refund-确认退款单 handover-交班单 queue-排队取号，如：['refund','handover','queue']
*/ */
private String printType; private String printType;
/** /**