Squashed commit of the following:

merge master
commit e6b8586e246d0d8aabbebcf2beeb005503b1d7a1
Author: Renxy <18510891294@163.com>
Date:   Tue Dec 26 09:58:26 2023 +0800

    修改保存

commit ddd93d62727b3aaa518a8694b98a9d8ba8055ae9
Author: Renxy <18510891294@163.com>
Date:   Mon Dec 25 16:30:06 2023 +0800

    Squashed commit of the following:
    merge dev
    commit 425c296e0e24d3aca2fc354b9165ef40a8fe1854
    Author: Renxy <18510891294@163.com>
    Date:   Mon Dec 25 16:29:23 2023 +0800

        修改bug

    commit 81e711027db3ec3f52c1ef363ee0374657e7de29
    Author: Renxy <18510891294@163.com>
    Date:   Mon Dec 25 15:47:11 2023 +0800

        修改bug

    commit 5fafa1f2b5de241390dc81c3af0ff9002e465620
    Author: Renxy <18510891294@163.com>
    Date:   Mon Dec 25 15:18:18 2023 +0800

        Squashed commit of the following:
        merge master
        commit 637b4d33a4af412091d25eb9900b39b375a7e465
        Author: Renxy <18510891294@163.com>
        Date:   Mon Dec 25 15:16:02 2023 +0800

            修改线上评论功能

        commit 669075e338bc570e7219798ce3a072b7279f9df9
        Merge: 63c5c55 fb7c78c
        Author: Renxy <18510891294@163.com>
        Date:   Mon Dec 25 11:04:11 2023 +0800

            Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
            解决冲突
            # Conflicts:
            #	src/pages/GreenGPT/index.js

        commit 63c5c55cb9fcd923b67c69dd24eed6b1b6c20e2e
        Author: Renxy <18510891294@163.com>
        Date:   Mon Dec 25 11:01:50 2023 +0800

            Squashed commit of the following:
            merge
            commit 16171a9ac605df3b12d1ee3fe039f2a983f0cf62
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 25 11:01:23 2023 +0800

                修改psr保存报没权限问题

            commit e0a9480a6d33ab309da72e18c065ca2aeafeceac
            Merge: 0188eec 1a470f4
            Author: Renxy <18510891294@163.com>
            Date:   Fri Dec 22 18:04:56 2023 +0800

                Merge branch 'cad_remark' into develop

            commit 0188eec8ffe6ae1da055b599fd34cf6492a11f2d
            Merge: 6c6d0a5 a5604cf
            Author: Renxy <18510891294@163.com>
            Date:   Fri Dec 22 17:56:29 2023 +0800

                Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop

            commit 6c6d0a5c9d91007821c23960e86633193490b193
            Author: Renxy <18510891294@163.com>
            Date:   Fri Dec 22 17:56:23 2023 +0800

                Squashed commit of the following:
                解决冲突
                commit 1a470f4635675e68aa40084af49ebd0bb53aa834
                Author: Renxy <18510891294@163.com>
                Date:   Fri Dec 22 17:53:25 2023 +0800

                    替换lucksheet

                commit 4b3ee993f354859f77cce231976ccc20b45a9f8f
                Author: Renxy <18510891294@163.com>
                Date:   Fri Dec 22 15:50:13 2023 +0800

                    cad评论功能

                commit 211b58120cca483190e9ab1e54d28f2a302dd37d
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 21 09:57:09 2023 +0800

                    cad评论

                commit a43d8aa0debc6cb8c00d302ef4abab818401b94d
                Author: Renxy <18510891294@163.com>
                Date:   Mon Dec 18 11:40:34 2023 +0800

                    替换ws地址

                commit 889553ca4a6fc9d9a95a59e0d095ce1a69df03a1
                Author: Renxy <18510891294@163.com>
                Date:   Mon Dec 18 11:21:11 2023 +0800

                    修改cad ws地址

                commit d9435420779e49c4d7362f81ba564d6c6136fcc2
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 17:34:24 2023 +0800

                    修改bug

                commit 8dcd6fc3fe2bf4fe830c51e2b5a8c24380d286c5
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 16:54:31 2023 +0800

                    Squashed commit of the following:
                    merge
                    commit 268df583cd9a3da2590d6bc3474c2c6539d51a84
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 14 16:54:09 2023 +0800

                        修改项目接口

                    commit e52c9a5f2d65695e78b62ef288bde6b67845c9b3
                    Merge: bc4916b 949eef2
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 14 15:55:35 2023 +0800

                        Merge branch 'master' into develop
                        解决冲突
                        # Conflicts:
                        #	src/pages/Cad/components/CadOADetail.js

                    commit bc4916bbb2c50bcc02a1468dc6992fc248e92ca9
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 14 15:12:37 2023 +0800

                        修改url

                    commit 04540d19c6cdd277570ff1d3c72e0d1678d915d3
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 14 15:06:47 2023 +0800

                        修改url

                    commit b633368b1438411d08ec3ed2c79ceb0df8caff8c
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 14 14:51:08 2023 +0800

                        Squashed commit of the following:
                        merge
                        commit 67c1c249be25266e723c85d0528c4a763faa9cd7
                        Author: Renxy <18510891294@163.com>
                        Date:   Thu Dec 14 14:49:14 2023 +0800

                            修改路由

                        commit 15967b6a4cf9296166be9d7db40292a111b1b18d
                        Author: Renxy <18510891294@163.com>
                        Date:   Thu Dec 14 14:25:48 2023 +0800

                            修改域名

                        commit ba0dd0d66eea0b451a292c64480cfa31ef2c2fa5
                        Author: Renxy <18510891294@163.com>
                        Date:   Thu Dec 14 09:22:21 2023 +0800

                            Squashed commit of the following:
                            cad
                            commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
                            Author: Renxy <18510891294@163.com>
                            Date:   Wed Dec 13 09:58:52 2023 +0800

                                上传图纸添加path字段

                            commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
                            Author: Renxy <18510891294@163.com>
                            Date:   Tue Dec 12 17:34:30 2023 +0800

                                修改bug

                            commit 44539389d68a26a8e5484d403694d8d1ccd30093
                            Author: Renxy <18510891294@163.com>
                            Date:   Tue Dec 12 17:02:44 2023 +0800

                                修改bug

                            commit b4798de286df4e15cd179483a1595282e48b468f
                            Author: Renxy <18510891294@163.com>
                            Date:   Tue Dec 12 16:36:31 2023 +0800

                                修改cadbug

                            commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
                            Author: Renxy <18510891294@163.com>
                            Date:   Tue Dec 12 14:13:24 2023 +0800

                                创建子审批

                            commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
                            Author: Renxy <18510891294@163.com>
                            Date:   Mon Dec 11 17:16:32 2023 +0800

                                update

                            commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
                            Merge: b2ba74b 879f068
                            Author: Renxy <18510891294@163.com>
                            Date:   Mon Dec 11 16:17:58 2023 +0800

                                Merge branch 'cad' into develop
                                解决冲突
                                # Conflicts:
                                #	src/pages/Home/index.js

                            commit 879f068f14d5e4fa58cb677a86a7b27021247882
                            Author: Renxy <18510891294@163.com>
                            Date:   Mon Dec 11 16:15:05 2023 +0800

                                修改cad修改antd前缀

                            commit a63c9413d969e359e621ff32ccb5246b0e574416
                            Author: Renxy <18510891294@163.com>
                            Date:   Thu Dec 7 17:48:01 2023 +0800

                                cad审批

                        # Conflicts:
                        #	src/pages/Cad/components/CreateChildrenModal.js
                        #	src/pages/Cad/components/CreateModal.js

                    commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
                    Author: Renxy <18510891294@163.com>
                    Date:   Wed Dec 13 09:58:52 2023 +0800

                        上传图纸添加path字段

                    commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 17:34:30 2023 +0800

                        修改bug

                    commit 44539389d68a26a8e5484d403694d8d1ccd30093
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 17:02:44 2023 +0800

                        修改bug

                    commit b4798de286df4e15cd179483a1595282e48b468f
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 16:36:31 2023 +0800

                        修改cadbug

                    commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 14:13:24 2023 +0800

                        创建子审批

                    commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 17:16:32 2023 +0800

                        update

                    commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
                    Merge: b2ba74b 879f068
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 16:17:58 2023 +0800

                        Merge branch 'cad' into develop
                        解决冲突
                        # Conflicts:
                        #	src/pages/Home/index.js

                    commit 879f068f14d5e4fa58cb677a86a7b27021247882
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 16:15:05 2023 +0800

                        修改cad修改antd前缀

                    commit a63c9413d969e359e621ff32ccb5246b0e574416
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 7 17:48:01 2023 +0800

                        cad审批

                # Conflicts:
                #	src/pages/Cad/detail.js
                #	src/pages/Cad/index.js

            commit 1a470f4635675e68aa40084af49ebd0bb53aa834
            Author: Renxy <18510891294@163.com>
            Date:   Fri Dec 22 17:53:25 2023 +0800

                替换lucksheet

            commit 4b3ee993f354859f77cce231976ccc20b45a9f8f
            Author: Renxy <18510891294@163.com>
            Date:   Fri Dec 22 15:50:13 2023 +0800

                cad评论功能

            commit 211b58120cca483190e9ab1e54d28f2a302dd37d
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 21 09:57:09 2023 +0800

                cad评论

            commit a5604cf927f7aebb535445c3b40248ff0310d112
            Author: xujunjie <645007605@qq.com>
            Date:   Mon Dec 18 17:46:55 2023 +0800

                修改GPT地址

            commit e27bedff6087379112589de5e22da2a4067aa253
            Author: xujunjie <645007605@qq.com>
            Date:   Mon Dec 18 17:39:15 2023 +0800

                增加GPT页面

            commit 268df583cd9a3da2590d6bc3474c2c6539d51a84
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 16:54:09 2023 +0800

                修改项目接口

            commit e52c9a5f2d65695e78b62ef288bde6b67845c9b3
            Merge: bc4916b 949eef2
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:55:35 2023 +0800

                Merge branch 'master' into develop
                解决冲突
                # Conflicts:
                #	src/pages/Cad/components/CadOADetail.js

            commit bc4916bbb2c50bcc02a1468dc6992fc248e92ca9
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:12:37 2023 +0800

                修改url

            commit 04540d19c6cdd277570ff1d3c72e0d1678d915d3
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:06:47 2023 +0800

                修改url

            commit b633368b1438411d08ec3ed2c79ceb0df8caff8c
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 14:51:08 2023 +0800

                Squashed commit of the following:
                merge
                commit 67c1c249be25266e723c85d0528c4a763faa9cd7
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 14:49:14 2023 +0800

                    修改路由

                commit 15967b6a4cf9296166be9d7db40292a111b1b18d
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 14:25:48 2023 +0800

                    修改域名

                commit ba0dd0d66eea0b451a292c64480cfa31ef2c2fa5
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 09:22:21 2023 +0800

                    Squashed commit of the following:
                    cad
                    commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
                    Author: Renxy <18510891294@163.com>
                    Date:   Wed Dec 13 09:58:52 2023 +0800

                        上传图纸添加path字段

                    commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 17:34:30 2023 +0800

                        修改bug

                    commit 44539389d68a26a8e5484d403694d8d1ccd30093
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 17:02:44 2023 +0800

                        修改bug

                    commit b4798de286df4e15cd179483a1595282e48b468f
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 16:36:31 2023 +0800

                        修改cadbug

                    commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 14:13:24 2023 +0800

                        创建子审批

                    commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 17:16:32 2023 +0800

                        update

                    commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
                    Merge: b2ba74b 879f068
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 16:17:58 2023 +0800

                        Merge branch 'cad' into develop
                        解决冲突
                        # Conflicts:
                        #	src/pages/Home/index.js

                    commit 879f068f14d5e4fa58cb677a86a7b27021247882
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 16:15:05 2023 +0800

                        修改cad修改antd前缀

                    commit a63c9413d969e359e621ff32ccb5246b0e574416
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 7 17:48:01 2023 +0800

                        cad审批

                # Conflicts:
                #	src/pages/Cad/components/CreateChildrenModal.js
                #	src/pages/Cad/components/CreateModal.js

            commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
            Author: Renxy <18510891294@163.com>
            Date:   Wed Dec 13 09:58:52 2023 +0800

                上传图纸添加path字段

            commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 17:34:30 2023 +0800

                修改bug

            commit 44539389d68a26a8e5484d403694d8d1ccd30093
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 17:02:44 2023 +0800

                修改bug

            commit b4798de286df4e15cd179483a1595282e48b468f
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 16:36:31 2023 +0800

                修改cadbug

            commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 14:13:24 2023 +0800

                创建子审批

            commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 17:16:32 2023 +0800

                update

            commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
            Merge: b2ba74b 879f068
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 16:17:58 2023 +0800

                Merge branch 'cad' into develop
                解决冲突
                # Conflicts:
                #	src/pages/Home/index.js

            commit 879f068f14d5e4fa58cb677a86a7b27021247882
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 16:15:05 2023 +0800

                修改cad修改antd前缀

            commit a63c9413d969e359e621ff32ccb5246b0e574416
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 7 17:48:01 2023 +0800

                cad审批

        commit fb7c78cb44841bbae53bf1485e6711903a8acdd2
        Author: xujunjie <645007605@qq.com>
        Date:   Thu Dec 21 14:19:54 2023 +0800

            替换gpt地址

        commit 28029aa8fc4fa552c969ba12ed2363905ebaf7d4
        Merge: a43d8aa a5604cf
        Author: xujunjie <645007605@qq.com>
        Date:   Mon Dec 18 18:23:06 2023 +0800

            Merge branch 'develop'

        # Conflicts:
        #	src/pages/Cad/detail.js

    commit 16171a9ac605df3b12d1ee3fe039f2a983f0cf62
    Author: Renxy <18510891294@163.com>
    Date:   Mon Dec 25 11:01:23 2023 +0800

        修改psr保存报没权限问题

    commit e0a9480a6d33ab309da72e18c065ca2aeafeceac
    Merge: 0188eec 1a470f4
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 18:04:56 2023 +0800

        Merge branch 'cad_remark' into develop

    commit 0188eec8ffe6ae1da055b599fd34cf6492a11f2d
    Merge: 6c6d0a5 a5604cf
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 17:56:29 2023 +0800

        Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop

    commit 6c6d0a5c9d91007821c23960e86633193490b193
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 17:56:23 2023 +0800

        Squashed commit of the following:
        解决冲突
        commit 1a470f4635675e68aa40084af49ebd0bb53aa834
        Author: Renxy <18510891294@163.com>
        Date:   Fri Dec 22 17:53:25 2023 +0800

            替换lucksheet

        commit 4b3ee993f354859f77cce231976ccc20b45a9f8f
        Author: Renxy <18510891294@163.com>
        Date:   Fri Dec 22 15:50:13 2023 +0800

            cad评论功能

        commit 211b58120cca483190e9ab1e54d28f2a302dd37d
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 21 09:57:09 2023 +0800

            cad评论

        commit a43d8aa0debc6cb8c00d302ef4abab818401b94d
        Author: Renxy <18510891294@163.com>
        Date:   Mon Dec 18 11:40:34 2023 +0800

            替换ws地址

        commit 889553ca4a6fc9d9a95a59e0d095ce1a69df03a1
        Author: Renxy <18510891294@163.com>
        Date:   Mon Dec 18 11:21:11 2023 +0800

            修改cad ws地址

        commit d9435420779e49c4d7362f81ba564d6c6136fcc2
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 14 17:34:24 2023 +0800

            修改bug

        commit 8dcd6fc3fe2bf4fe830c51e2b5a8c24380d286c5
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 14 16:54:31 2023 +0800

            Squashed commit of the following:
            merge
            commit 268df583cd9a3da2590d6bc3474c2c6539d51a84
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 16:54:09 2023 +0800

                修改项目接口

            commit e52c9a5f2d65695e78b62ef288bde6b67845c9b3
            Merge: bc4916b 949eef2
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:55:35 2023 +0800

                Merge branch 'master' into develop
                解决冲突
                # Conflicts:
                #	src/pages/Cad/components/CadOADetail.js

            commit bc4916bbb2c50bcc02a1468dc6992fc248e92ca9
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:12:37 2023 +0800

                修改url

            commit 04540d19c6cdd277570ff1d3c72e0d1678d915d3
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:06:47 2023 +0800

                修改url

            commit b633368b1438411d08ec3ed2c79ceb0df8caff8c
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 14:51:08 2023 +0800

                Squashed commit of the following:
                merge
                commit 67c1c249be25266e723c85d0528c4a763faa9cd7
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 14:49:14 2023 +0800

                    修改路由

                commit 15967b6a4cf9296166be9d7db40292a111b1b18d
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 14:25:48 2023 +0800

                    修改域名

                commit ba0dd0d66eea0b451a292c64480cfa31ef2c2fa5
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 09:22:21 2023 +0800

                    Squashed commit of the following:
                    cad
                    commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
                    Author: Renxy <18510891294@163.com>
                    Date:   Wed Dec 13 09:58:52 2023 +0800

                        上传图纸添加path字段

                    commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 17:34:30 2023 +0800

                        修改bug

                    commit 44539389d68a26a8e5484d403694d8d1ccd30093
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 17:02:44 2023 +0800

                        修改bug

                    commit b4798de286df4e15cd179483a1595282e48b468f
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 16:36:31 2023 +0800

                        修改cadbug

                    commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 14:13:24 2023 +0800

                        创建子审批

                    commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 17:16:32 2023 +0800

                        update

                    commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
                    Merge: b2ba74b 879f068
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 16:17:58 2023 +0800

                        Merge branch 'cad' into develop
                        解决冲突
                        # Conflicts:
                        #	src/pages/Home/index.js

                    commit 879f068f14d5e4fa58cb677a86a7b27021247882
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 16:15:05 2023 +0800

                        修改cad修改antd前缀

                    commit a63c9413d969e359e621ff32ccb5246b0e574416
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 7 17:48:01 2023 +0800

                        cad审批

                # Conflicts:
                #	src/pages/Cad/components/CreateChildrenModal.js
                #	src/pages/Cad/components/CreateModal.js

            commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
            Author: Renxy <18510891294@163.com>
            Date:   Wed Dec 13 09:58:52 2023 +0800

                上传图纸添加path字段

            commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 17:34:30 2023 +0800

                修改bug

            commit 44539389d68a26a8e5484d403694d8d1ccd30093
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 17:02:44 2023 +0800

                修改bug

            commit b4798de286df4e15cd179483a1595282e48b468f
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 16:36:31 2023 +0800

                修改cadbug

            commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 14:13:24 2023 +0800

                创建子审批

            commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 17:16:32 2023 +0800

                update

            commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
            Merge: b2ba74b 879f068
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 16:17:58 2023 +0800

                Merge branch 'cad' into develop
                解决冲突
                # Conflicts:
                #	src/pages/Home/index.js

            commit 879f068f14d5e4fa58cb677a86a7b27021247882
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 16:15:05 2023 +0800

                修改cad修改antd前缀

            commit a63c9413d969e359e621ff32ccb5246b0e574416
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 7 17:48:01 2023 +0800

                cad审批

        # Conflicts:
        #	src/pages/Cad/detail.js
        #	src/pages/Cad/index.js

    commit 1a470f4635675e68aa40084af49ebd0bb53aa834
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 17:53:25 2023 +0800

        替换lucksheet

    commit 4b3ee993f354859f77cce231976ccc20b45a9f8f
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 15:50:13 2023 +0800

        cad评论功能

    commit 211b58120cca483190e9ab1e54d28f2a302dd37d
    Author: Renxy <18510891294@163.com>
    Date:   Thu Dec 21 09:57:09 2023 +0800

        cad评论

    # Conflicts:
    #	src/pages/Cad/detail.js

commit 637b4d33a4af412091d25eb9900b39b375a7e465
Author: Renxy <18510891294@163.com>
Date:   Mon Dec 25 15:16:02 2023 +0800

    修改线上评论功能

commit 669075e338bc570e7219798ce3a072b7279f9df9
Merge: 63c5c55 fb7c78c
Author: Renxy <18510891294@163.com>
Date:   Mon Dec 25 11:04:11 2023 +0800

    Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
    解决冲突
    # Conflicts:
    #	src/pages/GreenGPT/index.js

commit 63c5c55cb9fcd923b67c69dd24eed6b1b6c20e2e
Author: Renxy <18510891294@163.com>
Date:   Mon Dec 25 11:01:50 2023 +0800

    Squashed commit of the following:
    merge
    commit 16171a9ac605df3b12d1ee3fe039f2a983f0cf62
    Author: Renxy <18510891294@163.com>
    Date:   Mon Dec 25 11:01:23 2023 +0800

        修改psr保存报没权限问题

    commit e0a9480a6d33ab309da72e18c065ca2aeafeceac
    Merge: 0188eec 1a470f4
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 18:04:56 2023 +0800

        Merge branch 'cad_remark' into develop

    commit 0188eec8ffe6ae1da055b599fd34cf6492a11f2d
    Merge: 6c6d0a5 a5604cf
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 17:56:29 2023 +0800

        Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop

    commit 6c6d0a5c9d91007821c23960e86633193490b193
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 17:56:23 2023 +0800

        Squashed commit of the following:
        解决冲突
        commit 1a470f4635675e68aa40084af49ebd0bb53aa834
        Author: Renxy <18510891294@163.com>
        Date:   Fri Dec 22 17:53:25 2023 +0800

            替换lucksheet

        commit 4b3ee993f354859f77cce231976ccc20b45a9f8f
        Author: Renxy <18510891294@163.com>
        Date:   Fri Dec 22 15:50:13 2023 +0800

            cad评论功能

        commit 211b58120cca483190e9ab1e54d28f2a302dd37d
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 21 09:57:09 2023 +0800

            cad评论

        commit a43d8aa0debc6cb8c00d302ef4abab818401b94d
        Author: Renxy <18510891294@163.com>
        Date:   Mon Dec 18 11:40:34 2023 +0800

            替换ws地址

        commit 889553ca4a6fc9d9a95a59e0d095ce1a69df03a1
        Author: Renxy <18510891294@163.com>
        Date:   Mon Dec 18 11:21:11 2023 +0800

            修改cad ws地址

        commit d9435420779e49c4d7362f81ba564d6c6136fcc2
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 14 17:34:24 2023 +0800

            修改bug

        commit 8dcd6fc3fe2bf4fe830c51e2b5a8c24380d286c5
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 14 16:54:31 2023 +0800

            Squashed commit of the following:
            merge
            commit 268df583cd9a3da2590d6bc3474c2c6539d51a84
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 16:54:09 2023 +0800

                修改项目接口

            commit e52c9a5f2d65695e78b62ef288bde6b67845c9b3
            Merge: bc4916b 949eef2
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:55:35 2023 +0800

                Merge branch 'master' into develop
                解决冲突
                # Conflicts:
                #	src/pages/Cad/components/CadOADetail.js

            commit bc4916bbb2c50bcc02a1468dc6992fc248e92ca9
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:12:37 2023 +0800

                修改url

            commit 04540d19c6cdd277570ff1d3c72e0d1678d915d3
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 15:06:47 2023 +0800

                修改url

            commit b633368b1438411d08ec3ed2c79ceb0df8caff8c
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 14 14:51:08 2023 +0800

                Squashed commit of the following:
                merge
                commit 67c1c249be25266e723c85d0528c4a763faa9cd7
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 14:49:14 2023 +0800

                    修改路由

                commit 15967b6a4cf9296166be9d7db40292a111b1b18d
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 14:25:48 2023 +0800

                    修改域名

                commit ba0dd0d66eea0b451a292c64480cfa31ef2c2fa5
                Author: Renxy <18510891294@163.com>
                Date:   Thu Dec 14 09:22:21 2023 +0800

                    Squashed commit of the following:
                    cad
                    commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
                    Author: Renxy <18510891294@163.com>
                    Date:   Wed Dec 13 09:58:52 2023 +0800

                        上传图纸添加path字段

                    commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 17:34:30 2023 +0800

                        修改bug

                    commit 44539389d68a26a8e5484d403694d8d1ccd30093
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 17:02:44 2023 +0800

                        修改bug

                    commit b4798de286df4e15cd179483a1595282e48b468f
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 16:36:31 2023 +0800

                        修改cadbug

                    commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
                    Author: Renxy <18510891294@163.com>
                    Date:   Tue Dec 12 14:13:24 2023 +0800

                        创建子审批

                    commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 17:16:32 2023 +0800

                        update

                    commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
                    Merge: b2ba74b 879f068
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 16:17:58 2023 +0800

                        Merge branch 'cad' into develop
                        解决冲突
                        # Conflicts:
                        #	src/pages/Home/index.js

                    commit 879f068f14d5e4fa58cb677a86a7b27021247882
                    Author: Renxy <18510891294@163.com>
                    Date:   Mon Dec 11 16:15:05 2023 +0800

                        修改cad修改antd前缀

                    commit a63c9413d969e359e621ff32ccb5246b0e574416
                    Author: Renxy <18510891294@163.com>
                    Date:   Thu Dec 7 17:48:01 2023 +0800

                        cad审批

                # Conflicts:
                #	src/pages/Cad/components/CreateChildrenModal.js
                #	src/pages/Cad/components/CreateModal.js

            commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
            Author: Renxy <18510891294@163.com>
            Date:   Wed Dec 13 09:58:52 2023 +0800

                上传图纸添加path字段

            commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 17:34:30 2023 +0800

                修改bug

            commit 44539389d68a26a8e5484d403694d8d1ccd30093
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 17:02:44 2023 +0800

                修改bug

            commit b4798de286df4e15cd179483a1595282e48b468f
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 16:36:31 2023 +0800

                修改cadbug

            commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 14:13:24 2023 +0800

                创建子审批

            commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 17:16:32 2023 +0800

                update

            commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
            Merge: b2ba74b 879f068
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 16:17:58 2023 +0800

                Merge branch 'cad' into develop
                解决冲突
                # Conflicts:
                #	src/pages/Home/index.js

            commit 879f068f14d5e4fa58cb677a86a7b27021247882
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 16:15:05 2023 +0800

                修改cad修改antd前缀

            commit a63c9413d969e359e621ff32ccb5246b0e574416
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 7 17:48:01 2023 +0800

                cad审批

        # Conflicts:
        #	src/pages/Cad/detail.js
        #	src/pages/Cad/index.js

    commit 1a470f4635675e68aa40084af49ebd0bb53aa834
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 17:53:25 2023 +0800

        替换lucksheet

    commit 4b3ee993f354859f77cce231976ccc20b45a9f8f
    Author: Renxy <18510891294@163.com>
    Date:   Fri Dec 22 15:50:13 2023 +0800

        cad评论功能

    commit 211b58120cca483190e9ab1e54d28f2a302dd37d
    Author: Renxy <18510891294@163.com>
    Date:   Thu Dec 21 09:57:09 2023 +0800

        cad评论

    commit a5604cf927f7aebb535445c3b40248ff0310d112
    Author: xujunjie <645007605@qq.com>
    Date:   Mon Dec 18 17:46:55 2023 +0800

        修改GPT地址

    commit e27bedff6087379112589de5e22da2a4067aa253
    Author: xujunjie <645007605@qq.com>
    Date:   Mon Dec 18 17:39:15 2023 +0800

        增加GPT页面

    commit 268df583cd9a3da2590d6bc3474c2c6539d51a84
    Author: Renxy <18510891294@163.com>
    Date:   Thu Dec 14 16:54:09 2023 +0800

        修改项目接口

    commit e52c9a5f2d65695e78b62ef288bde6b67845c9b3
    Merge: bc4916b 949eef2
    Author: Renxy <18510891294@163.com>
    Date:   Thu Dec 14 15:55:35 2023 +0800

        Merge branch 'master' into develop
        解决冲突
        # Conflicts:
        #	src/pages/Cad/components/CadOADetail.js

    commit bc4916bbb2c50bcc02a1468dc6992fc248e92ca9
    Author: Renxy <18510891294@163.com>
    Date:   Thu Dec 14 15:12:37 2023 +0800

        修改url

    commit 04540d19c6cdd277570ff1d3c72e0d1678d915d3
    Author: Renxy <18510891294@163.com>
    Date:   Thu Dec 14 15:06:47 2023 +0800

        修改url

    commit b633368b1438411d08ec3ed2c79ceb0df8caff8c
    Author: Renxy <18510891294@163.com>
    Date:   Thu Dec 14 14:51:08 2023 +0800

        Squashed commit of the following:
        merge
        commit 67c1c249be25266e723c85d0528c4a763faa9cd7
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 14 14:49:14 2023 +0800

            修改路由

        commit 15967b6a4cf9296166be9d7db40292a111b1b18d
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 14 14:25:48 2023 +0800

            修改域名

        commit ba0dd0d66eea0b451a292c64480cfa31ef2c2fa5
        Author: Renxy <18510891294@163.com>
        Date:   Thu Dec 14 09:22:21 2023 +0800

            Squashed commit of the following:
            cad
            commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
            Author: Renxy <18510891294@163.com>
            Date:   Wed Dec 13 09:58:52 2023 +0800

                上传图纸添加path字段

            commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 17:34:30 2023 +0800

                修改bug

            commit 44539389d68a26a8e5484d403694d8d1ccd30093
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 17:02:44 2023 +0800

                修改bug

            commit b4798de286df4e15cd179483a1595282e48b468f
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 16:36:31 2023 +0800

                修改cadbug

            commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
            Author: Renxy <18510891294@163.com>
            Date:   Tue Dec 12 14:13:24 2023 +0800

                创建子审批

            commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 17:16:32 2023 +0800

                update

            commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
            Merge: b2ba74b 879f068
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 16:17:58 2023 +0800

                Merge branch 'cad' into develop
                解决冲突
                # Conflicts:
                #	src/pages/Home/index.js

            commit 879f068f14d5e4fa58cb677a86a7b27021247882
            Author: Renxy <18510891294@163.com>
            Date:   Mon Dec 11 16:15:05 2023 +0800

                修改cad修改antd前缀

            commit a63c9413d969e359e621ff32ccb5246b0e574416
            Author: Renxy <18510891294@163.com>
            Date:   Thu Dec 7 17:48:01 2023 +0800

                cad审批

        # Conflicts:
        #	src/pages/Cad/components/CreateChildrenModal.js
        #	src/pages/Cad/components/CreateModal.js

    commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
    Author: Renxy <18510891294@163.com>
    Date:   Wed Dec 13 09:58:52 2023 +0800

        上传图纸添加path字段

    commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
    Author: Renxy <18510891294@163.com>
    Date:   Tue Dec 12 17:34:30 2023 +0800

        修改bug

    commit 44539389d68a26a8e5484d403694d8d1ccd30093
    Author: Renxy <18510891294@163.com>
    Date:   Tue Dec 12 17:02:44 2023 +0800

        修改bug

    commit b4798de286df4e15cd179483a1595282e48b468f
    Author: Renxy <18510891294@163.com>
    Date:   Tue Dec 12 16:36:31 2023 +0800

        修改cadbug

    commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
    Author: Renxy <18510891294@163.com>
    Date:   Tue Dec 12 14:13:24 2023 +0800

        创建子审批

    commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
    Author: Renxy <18510891294@163.com>
    Date:   Mon Dec 11 17:16:32 2023 +0800

        update

    commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
    Merge: b2ba74b 879f068
    Author: Renxy <18510891294@163.com>
    Date:   Mon Dec 11 16:17:58 2023 +0800

        Merge branch 'cad' into develop
        解决冲突
        # Conflicts:
        #	src/pages/Home/index.js

    commit 879f068f14d5e4fa58cb677a86a7b27021247882
    Author: Renxy <18510891294@163.com>
    Date:   Mon Dec 11 16:15:05 2023 +0800

        修改cad修改antd前缀

    commit a63c9413d969e359e621ff32ccb5246b0e574416
    Author: Renxy <18510891294@163.com>
    Date:   Thu Dec 7 17:48:01 2023 +0800

        cad审批

commit fb7c78cb44841bbae53bf1485e6711903a8acdd2
Author: xujunjie <645007605@qq.com>
Date:   Thu Dec 21 14:19:54 2023 +0800

    替换gpt地址

commit 28029aa8fc4fa552c969ba12ed2363905ebaf7d4
Merge: a43d8aa a5604cf
Author: xujunjie <645007605@qq.com>
Date:   Mon Dec 18 18:23:06 2023 +0800

    Merge branch 'develop'

src/pages/PSRManage/detail.js

@@ -557,7 +557,7 @@ const PSRDetail = () => {
       psr_json_data: JSON.stringify(allData),
     };
     console.log(params);
-    // runSave(params);
+    runSave(params);
   };
 
   //获取当月发生额的月份