Merge remote-tracking branch 'origin/master'

Fancy

2024-07-31 27c0c61e48bfb3e870d44b3b53a820568fcce5d5

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

@@ -28,6 +28,14 @@
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;

    /**
     * 用户实体编号
     */
    @NotNull(message="[用户登录编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long workId;

    /**
    * 用户实体编号
    */