Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 72aaf45389cd09c206ee1b90f0c7f5bf59782930

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java

@@ -137,6 +137,10 @@
    @TableField("supplier_money")
    private BigDecimal supplierMoney;

    @ApiModelProperty(value = "平台是否分佣成功 1=是 2=否")
    @TableField("is_platform_commission")
    private Integer isPlatformCommission;

    /**
     * 新增执行
     */