Merge remote-tracking branch 'origin/master'

xuhy

2024-12-27 83c4dd24f674b5f2c3d10ab98d04e8562202449b

 manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java

@@ -69,6 +69,12 @@
    @ApiModelProperty(value = "镜架-型号名称")
    @TableField("modelName")
    private String modelName;
    @ApiModelProperty(value = "镜架型号id 前端忽略")
    @TableField("modelId")
    private Integer modelId;
    @ApiModelProperty(value = "类型 1镜架 2镜片")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "商品价格")
    @TableField("goodsMoney")