Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 87c1e76403b09b137ad07abd75350a4b4cc23694

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

@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**