Merge branch 'develop'

king

2024-10-30 071077ce465d0e4f7b8369365a24b67a891432a0

 src/utils/utils-custom.js

@@ -4205,7 +4205,7 @@

              if @works_begin_branch@ = 'Y'
              begin
                  update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
                  update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
                  where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'
              end
              else