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

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -168,7 +168,7 @@
                param.getCstmr(),    // 客户编号
                param.getCstmrName(),    // 客户
                param.getTel(),    // 联系方式
                null,    // 操作人员
                getUser().getUsername(),    // 操作人员
                null,    // 合计金额
                null,    // 优惠率
                null,    // 优惠金额
@@ -191,6 +191,7 @@
                now,    // 修改时间
                null    // 备注
        );
        order.setOperMemb(getUser().getUsername());
        if (!orderService.insert(order)) {
            throw new CoolException("保存订单主档失败");
        }