Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-02 f604f87781d7cdae5571465a3bafffff53313028

 management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js

@@ -59,6 +59,10 @@
            validators: {
                notEmpty: {
                    message: '身份证号码不能为空'
                },
                regexp: {
                    regexp: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
                    message: '请输入合法身份证号码'
                }
            }
        },