Merge remote-tracking branch 'origin/master'

Fancy

2025-01-16 c07eb0467fd3f3ee8321721acc5977f0f84e38c2

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java

@@ -98,6 +98,10 @@
    * 备注
    */
    public String memo;
    /**
     * 默认为1,没有设备码时可设置生产数量
     */
    public Integer number;

    @TableField(exist = false)
    public String planName;