Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

7 小时以前 025f88f0025ce0be4609b763e5cdc9a86be42144

 src/main/java/com/zy/api/entity/StockAdjustParams.java

@@ -13,7 +13,7 @@
public class StockAdjustParams extends OrderParams {

    @ApiModelProperty("调整原因")
    private String resason;
    private String reason;

    @ApiModelProperty("调整原因名称")
    private String reason_name;