From e9bde4db76b595037843e203dcc07f02cb40f5fb Mon Sep 17 00:00:00 2001
From: TermiNexus <wyt18222152539wyt@163.com>
Date: Fri, 7 Aug 2026 00:56:21 +0800
Subject: [PATCH] =?UTF-8?q?"chore(gvsdsdk):=20=E6=B8=85=E7=90=86=E8=BF=87?=
 =?UTF-8?q?=E6=97=B6=E7=82=B9=E4=B8=8E=E6=AD=BB=E4=BB=A3=E7=A0=81=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C=E6=9C=9F=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- models: 修正过时文档、UserRole 遗留字段标注废弃、抽象 User 补 IsStaff/IsSuperuser
- models: CopyToRole 补 CompanyUUID 默认值，修复 RolePermission 插入必失败缺陷
- form_service: 对齐主项目值转换（Boolean/时区/空值），移除 NullBooleanField 遗留映射
- auth: 删除无引用的 GetDefaultAvatar 与 ShopManager/PositionManager，清理惰性导出
- db_router/model_base/msync: 简化模块集合、移除 typing_extensions 死兜底、复用 GenerateChallenge
- 删除残留文件（空测试文件、无源 pyc）"
---
 __init__.py                               |   3 +-
 __pycache__/__init__.cpython-312.pyc      | Bin 12407 -> 12353 bytes
 __pycache__/db_router.cpython-312.pyc     | Bin 3953 -> 3779 bytes
 __pycache__/form_service.cpython-312.pyc  | Bin 21496 -> 22094 bytes
 __pycache__/model_base.cpython-312.pyc    | Bin 31046 -> 30923 bytes
 __pycache__/models.cpython-312.pyc        | Bin 41566 -> 42478 bytes
 auth/__init__.py                          |  15 +--
 auth/__pycache__/__init__.cpython-312.pyc | Bin 1967 -> 1571 bytes
 auth/__pycache__/elt_auth.cpython-312.pyc | Bin 2402 -> 0 bytes
 auth/__pycache__/managers.cpython-312.pyc | Bin 14754 -> 6652 bytes
 auth/cookie.py                            |  11 --
 auth/managers.py                          | 153 +---------------------
 db_router.py                              |  14 +-
 form_service.py                           |  38 ++++--
 model_base.py                             |   7 +-
 models.py                                 |  39 ++++--
 msync/__pycache__/client.cpython-312.pyc  | Bin 15831 -> 15454 bytes
 msync/client.py                           |   6 -
 payment/gateways/_test_write.txt          |   0
 19 files changed, 66 insertions(+), 220 deletions(-)
 delete mode 100644 auth/__pycache__/elt_auth.cpython-312.pyc
 delete mode 100644 auth/cookie.py
 delete mode 100644 payment/gateways/_test_write.txt

diff --git a/__init__.py b/__init__.py
index b24ecbc..c78c9d5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,11 +13,10 @@ GVSDS 分布式服务间通信 SDK，作为子服务器（如 ATestCServer）和
 包结构：
     gvsdsdk/
     ├── auth/               # 用户认证与权限模块
-    │   ├── cookie.py       # 默认头像等工具
     │   ├── crypto.py       # 密码哈希 + AES 加密
     │   ├── middleware.py    # CurrentRoleMiddleware
     │   ├── permissions.py   # RBAC/ABAC 权限
-    │   └── managers.py     # UserManager + RoleManager
+    │   └── managers.py     # RoleManager（UserManager 在 models.py）
     ├── msync/              # MSYNC 服务间通信
     ├── commission/         # 分佣引擎
     │   ├── models.py       # 分佣数据模型
diff --git a/__pycache__/__init__.cpython-312.pyc b/__pycache__/__init__.cpython-312.pyc
index d4782ed55b393a4e6631cf76d1d2e80fee74e25f..76d35aab4413828918e874b573dafe37f3b3a175 100644
GIT binary patch
delta 260
zcmeyKa4>=QG%qg~0}y2GDaqp6$ZNvFczClDOC8hXKWxXeg7R}xeG~H%(^HGy@979F
zPA!7+6rRpmp^%%OlA2SjS5WzWPv_>_?2lR0h11K5Q;Jiv_2c6+^D;}~<AIX5xYJWh
z;>%KtiZk=`iuiz5xo`f!Q^&;UvpJuCH8W$zW@%wfM#lKbt|E8&8i3NDLGEc_xXYqC
zd84S~<U&y+#@5M8M0*&!CL4;iG4@a1A=bn=WwNz+1LMred&FB9=S_B$Xkl9n)KwHR
w*+JZXGMA(s+X@iZ9n9^ObYNV&`J7}AFQen;X!WIxteT80pTjn@Y8J5r05?!sU;qFB

delta 258
zcmX?@@I8U|G%qg~0}y=G&&o2}$ZNvF_-?ZkOC6J1etvdls$M~*0t6^4yxcwG#kwU=
zmuz|3-2Z%S=hN*=pSEtFyo&9PWN2|}k#AyNVtQ(kg0@0XeoiWsw|N8mV-^v)6swqE
zUq?Sjch{Kovf`BDl<b(vb9iJKJvQ&+sbgaF-E7Ifnwc?k^HU*BM#hB6{33T58z;XN
zX<%%doG04D*gg5TXdB~%$xUKSoKt~LEph-7lN&^BCVPt8FwUCXCf>q0e=@g33*(Z>
s6C|2ASAx{I!_<UJIxw!=JVUaFm(gjns`^q!RxL)B&k>u?YZS2q0L(30Jpcdz

diff --git a/__pycache__/db_router.cpython-312.pyc b/__pycache__/db_router.cpython-312.pyc
index a7c918096353cf6d7eb5c903ccf639066aadf6f0..6da9796bf1dbc079b43176fe2c823d7d69cb0e9b 100644
GIT binary patch
delta 767
zcmYjOOK4L;6n*pZetDmyi77QUY13A#X^Qz6#7_`igi<J4L=hr1G`wfpm=DZ*QN)cx
zK%t_GyRb{$83aMQb*11&5JbiDcDivXQCC@cXR>JT;>^sQbIzT6XE60X8Tx2hx`0uB
z>otbv>rhtA1=tzm??r^Cf+JLjEmTCCR05*lNVd2^UJ}j_DzY8u!Ci6IFl@a?D(0PF
z+T3|1-WTDv{3xR#%UA1;x9)kgFZz<}G;dIrbwz|!Y8b2Ea&6bXnT6xZS+WQXrA1WO
zRgzHy2{g1vrDLF~MUsP(Iz^&zU5%5+&{b#PxgLWL>Liiir+Nf_s0ZMXc2$w6g<5!^
zW#+=T@#R*>cACC|OSkFJI5U<IQW$9cO)I5~EVqnsPxz+@(fIcGGxJ65OC<kL*)<~H
zjl^dov0eFU9D}9c0zP3)kHc1Qb$%KpG=k6%P*#g35qx=Lv+cPq8|J74(R1WH6!Z*<
z?yTtw$#C5`<C>SdZEv&Xlqu~{ZbfG?zfb(cD3CI|Ggh!}*xV}0czq=;(n(x-Giiy}
z_N7j(k>^;TbIfC3lb_6!WEEtqh$d&OrF;VK)AC3s+BNRu>wHkv_Ik@18L(2=0Uy&F
z)Lw&M*7QV_6`o-RmakPgy;`LckPOXVV!op;Sa+27d6?~vGRQE<BJ>5yUB*~~J(B}V
zxfc+6!a$73+F$|tq0<&;GE!Qh1^690xR}F(uQWULx<f~D_JMnrL#;IW>~r)KoCs&b
M%Y?-K2n;#tKOp+06951J

delta 910
zcmYjO&rcIU6rS1cZnr;nrBHMW7Fvi%sVRaL{6QclASA_LERxu08gQ4=+HK8jF_OT+
z1ih#UW)3EL<RWs>_z#$P^diQDWWC@Y;GuXiHAde|X<)MXX6Ad}``)~_pTgA+?X#+S
z5v(<JsxYj+*ZPGQVbA#mU|u2<Ww3!Vf`KzG0h!_wGK5XMjhP;yjKny@wbWp!C3FQm
z>nP(l{DyBGXVevMO#SdmcqB}Xx*(&b<sR6EZQM&(Wy37mwd0NZ{rMHkEL9qOsKMVY
zTUOq-^X1Y(h_*}5;y&<l+&Qx{U#XBS!4Yk<xJVdl3jmQwEqGvXn|_rp<3YM72Wgjl
z3w!CR9B$S?L;{C$(n7c8Bpw1;2X3YR<Pd&KL++@!iV6bVa0g{OuqqTJ`oq^kXWVUA
z=BG7xGgcs+(<RabZcbBnaxOid9#3Vj&5Ylio=DTb?s#`I3rW0VM}}>=Xp)nxxCjt|
z1?5x9h<u50bM(2Q>l?GXt$jQ2`TE{0?k2`|5@R2|-x4YMPU(XOepm86-Jm8xfGrnc
z6-X4ok(TnMifyxD*NqFFv-m1~?TPcW5Z&|qjPq2T$^AE$OO?E3P7qQi+>P`Ae<c66
zcMzv&+&2yR4}DLQ3WR540_lXEcM%hLc}FZS6b3jBlGDuNNO!~jAv{M*{v?=e`X>h>
z5RXaqJi%DtK8}}9C|jDh%({UDDrkbwr(I3rJM_BRd7>3qa*7#fj*{i_Y?idqCu+}P
zn8hLt*kA~2k?>}F*(uJTpTRkREkw9g3nSQDIj~9EX@GT96#|k{?L~TYABkP^FC^;j
zFJiE&(Ld@%mFKdwm`sM~6-_^rgo`5=%ekCM>V_A9IV@6BM(RI*l#I~FTK};bjD!1#
HAs77z0xH;O

diff --git a/__pycache__/form_service.cpython-312.pyc b/__pycache__/form_service.cpython-312.pyc
index a8e392b5c1ca06ae158992236aeb964c24250255..48f5de5c77a6d66ab38198186fbf3d6e0ecdfb35 100644
GIT binary patch
delta 3532
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

delta 3066
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

diff --git a/__pycache__/model_base.cpython-312.pyc b/__pycache__/model_base.cpython-312.pyc
index 6cf5b5622139b2070836c9c1bfb75717d5ee42ca..1f0691e1d26028a5fb5785c127094a9fb535a2b7 100644
GIT binary patch
delta 1242
zcmY+DdrVVT9LMkX_O_)!X?as#QYe)2syf6d2;(KKydOnVaU0926D){TobKUkBrIlb
z!Y?ys&h3vmk_}_BojoF9QKw-s7~ISvTeHOwG{(Kf%^)V*PCG)}&B^EFe(vx0JHK;I
z?!+7>??FGQ*M~~tsT|+kJv^j0p>)XVH1<TeBOoy_wb#&NbQ_2ECmjf3I&W-GoI4JZ
zEP3=SbQFO^Npi;r-@{n=8U3id=n`b9Mq&{I5;J&0Jn<%>M^%g8OkEN)vPc4pV$p&z
zELJd%#S11dlVBoC5=>?(f~jnoU|JC~iz%ID2wGUCU>36qW;2^$4$BqHWBGyw%r3Z`
ztq@#En~-|oZNvL;C$b7p600l`O)wX$8c^KHVy+f*O0d`UqSu<G{!@d_A)Ir`EepC0
z!qqOhw4kdKu71gxgRViiMvt+(N}@Sy6xP!>xzUs&hcsGPJ8KflW(LEWMOe#HYF5y-
z3KuR?8~!`6$LX=0X&Y4*4>Eh7%C?c8kfT%xrBSslU1{}rxBAs>{e51KUuoOd=kaR;
zZ142>)vn&I9ld;BJqy_B2dy1N6dp2(HS}GGA9l`lMG74JCw+vBE&QS3Jg|e#Mb5)V
zA4fevKmQ<lEwGnv#r%zz_-t$maDb=9_X7iTJmFWoN&}`Dc=^`EXB51}ze-h9c$Z%_
zPXlN9>5LfQQ#xn4fiXIkc?n-oTh?Xm1+fv|*V1rH4E-Lhql1MdwAWgWOEhM^h6#Qo
zI|-QNBequH8ehoifc8cpV<wm}RjQ*G@~-1YUZ1aqW;XEU4xP8gQcpn_?(*pZ9q=2U
zvDX8Ca{G!czycjzIWPYs(clx8p`yA%KeXJsN(RCxr|1C;WM2I}qWPoMXMuSB;hJZG
z6s|8e0A@-lxsObWTsMtey1Q;%9N9=|D6on?Dw{zu(UT)6rM2Z2gz=}#D}mSedldyT
zs_A;wBRKg~bs5k=5jA6Ip({0?!$pT27qN*donK-zX*OKcJSF}p-*W0~j-{s7nqj9x
z`L$)}q@LQ_VANXoGoGWe`a7uL)`rtSFI{cCk6m=3>7=-qj^<OE7Xt<I77IA2qor80
z|M8j*S`g|`Kou@Vy`mZTe?(DRF$TqwCrR%r#SvcT5_>sH$J(!8J9lsFRB(!qZ%zk}
z^P3&DT71HDS&4#Q__l4Cz#M<Q%K<#()7>TjbZ`5cxWxy(3kocBc;^JH-0AC+kw;^@
zzlECK=-+7!3*20G05$=ejf{I-^zxpm+;>E0Vo19_6Z}IZ>dnb<Q2r{AkTEOiZb}`~
S!Eswk<_DiY0kzL8qW=Y9)o`N#

delta 1332
zcmY+E4@{J09LJyU-OIt990wjC$NxXa9R~=ANCn6r0XaaF|Ky2D`kVzFr2JJkrzUH|
z(Ug8`)gWC?vkg{jPg~QqF^rtbD%MPkqN3K!H5<qh!lgZT60>*jKF|App6B;Gzvs{U
zPR!xTJ?JO&dL5J37g5D6cLww(xCX4HeqdV0!M$8ctDnPf;Aq$pa35DtYp^32jBB~h
zwWc-15dx-SPG7!i8160@bC^8uzFa@zH>_HAp(<9wxS^MEf2WVrWRiMVy<8X8%y<A_
zP2ffzC>g|qCD-r}NfQs14CCRF5&1k)7EwG}GKR-W#&NS`Jhw<%d4i;kCrT#qWXZKW
zMKYDANv`AR1gb>j5x!~2a2}3uUg(VAML9AFUeAkr6-T5jH_I~0lWU30)xMH{w8xc7
zSGM9}Jg!{2Eh{e8<0_=vy5izIZku$K&ebij)0owWGI}@3c;vq&u<!<6C5N_pnpVrE
zH7nr>9#<=!UWQjcUbH9aw2agZE6a<Scu*b3oCY&%*U3$C@1DPV_rSKZQ|R~ZVF%RP
zSr2T_b}guwXjA#Ap{2uKHX8AY@=|J?uD#-_*RMb$jd-Ubn||<~KrX%SGldLsT$`z&
zLR`}OsjypIGmHYA)EBUb9(rZ<eH;=8jak59`Z(|*jtLQz1N4g7;4Yw#_J-WWYgB8R
z!G4h$+N9u&cr#K_<D3|ZxdjN(85am#qCWFYj8aqlXShse%eeRFa$fC|j3%oBY1F8t
z%8VScTMKZNPFTOfgm5H;0h6NJRs-A+*ApAz{k=P6=5fgBTrHI)e~n*6#9A+Ces@>h
zrjynn+L+ReKgER<Eif-WO059?7LU?)0*`2C`l3n!HLM?p4~1t;!B;F~r~rRj+HfC%
zG?)1uLd3*V9{}Ov&@;P%STUVt04#Jjdmf22lXDAcbaCUSa?!eTbwCy!%bP(y?a6-+
zg`_JmLnl%T3V{L9u_;9*Ps7=w2iPi37v}*r^yB7BXrQ-CK7oU(>|@wT#?s4ZqMM~-
znmzI}YfqzfRY4S8Q$mw=h5jka!(Q50{u`PpZp$BVk)h%?O2k6NIiQ1vw$0-JovIv^
zTa#S%j^?PlhvelR?37%ctvUW=r*^t7)vIomvE1sortkkPG_~32mqQNHbZst9itsu)
znb)bQ{u=g)#D?b;oE7~$Vu3;NVPm;BE{X?xaum#or(cW*7Q}PScHp77&|(5KH1^UP
zxFZ@|OA2gMz5fc5g{gg?3hU@Z=MCs+SJ!@j_YbN)!3~>)Es1{astak~A=8=)=sdWu
zx$T8r&I6s!wvOhP+d61N_m{devQFNt<6F}AtO=~Y#p=Id^|SKOS*Mk-zkC=XL`u(F
rNLie1FfbqEJqB2RQY@2-WmYX8mpTGu^m$E@nT?xQ6|Gl~r$h2z5wU^v

diff --git a/__pycache__/models.cpython-312.pyc b/__pycache__/models.cpython-312.pyc
index 1570c2be4256473be9d6c4274cd13835ca33d31a..37041c846488f9c0db135cb439a027e0fbc08612 100644
GIT binary patch
delta 5396
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
G)BgiX<8-tD

delta 4481
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

diff --git a/auth/__init__.py b/auth/__init__.py
index 69db92b..00ca8ea 100644
--- a/auth/__init__.py
+++ b/auth/__init__.py
@@ -1,21 +1,16 @@
 """gvsdsdk.auth — 用户认证与权限模块"""
 
 __all__ = [
-    'GetDefaultAvatar',
     'HashPassword', 'VerifyPassword', 'SymmetricEncrypt', 'SymmetricDecrypt', 'FileSHA1', 'FileSHA256', 'BytesSHA1', 'BytesSHA256',
     'CurrentRoleMiddleware',
     'IsAdminUser', 'IsCompanyMember', 'CompanyScopedMixin', 'TenantScopedMixin', 'UserScopedMixin', 'PermissionVerifier',
     'IsAdminScopeDisabled', 'IsTenantScopeDisabled',
     'IsAdmin', 'IsSuperAdmin', 'IsTenantAdmin',
-    'RoleManager', 'ShopManager', 'PositionManager',
+    'RoleManager',
 ]
 
 
 def __getattr__(name):
-    if name == 'GetDefaultAvatar':
-        from gvsdsdk.auth.cookie import GetDefaultAvatar
-        globals()['GetDefaultAvatar'] = GetDefaultAvatar
-        return GetDefaultAvatar
     if name in ('HashPassword', 'VerifyPassword', 'SymmetricEncrypt', 'SymmetricDecrypt', 'FileSHA1', 'FileSHA256', 'BytesSHA1', 'BytesSHA256'):
         from gvsdsdk.auth import crypto as _m
         val = getattr(_m, name)
@@ -39,12 +34,4 @@ def __getattr__(name):
         from gvsdsdk.auth.managers import RoleManager
         globals()['RoleManager'] = RoleManager
         return RoleManager
-    if name == 'ShopManager':
-        from gvsdsdk.auth.managers import ShopManager
-        globals()['ShopManager'] = ShopManager
-        return ShopManager
-    if name == 'PositionManager':
-        from gvsdsdk.auth.managers import PositionManager
-        globals()['PositionManager'] = PositionManager
-        return PositionManager
     raise AttributeError(f"module 'gvsdsdk.auth' has no attribute {name!r}")
diff --git a/auth/__pycache__/__init__.cpython-312.pyc b/auth/__pycache__/__init__.cpython-312.pyc
index 113e3b6a535f539335205580ff71c9950d742030..e8b2160c72a9ae58cb4a9973177827ab87b6f6ae 100644
GIT binary patch
delta 721
zcma)4J8aZI5Z$%cpPbK^BDo`k28cMYP%a20iYN*KL>VNM8d*-(aZLO<&F-BP$tNNj
zYUCmXN|g#-foKs0Jv9ZcXz3706sg#;4@5zckvuy)^WMzck>AdrwmY9(w?&lQ`XHaZ
zH(z!3X!qUAC$#)Udv`e{<d_tM(=mZ7T;qB|QaYiONCP=&1ue)_YvPGkXwoV-^$U@<
zjXZX6gAnK{rjfAJnCO%gy0jWJA=6pF*#>sfYmPaaWvN-_d1l>dX4x~|oZ?yM;XQ45
zt-l(b#7^fXOlf5Q(b%drvTY)}fAsTqL0)So+Encc?FIGR$DR$ij<U~Iu71O;M=Ns|
z4u>)a+_XoV!v+Uodu(N0A)H|dX)HvXXTsBAL6u+;9S&1<H{fZU`67gIyc<HV&O)#J
z%2xYM)sDu33w|&NMsgo6s$ykDp$w!16(spikce{2SbmNIU>V&d1a<%A4bmVBq7X#g
zz3SXo?09D+!$$x)ct*vtAPp<cPb+;KB=sw5sKB4$GTPbFtl=68S@Zoki>2=mhKH5o
z`%zfBraj+RXjgsWvvNnId}w|w?^%Nfn14gyx;o&Ra%c8Nn)6W-Zo*A<#T^UW#&?}k
V`i0#7!7N8RvVJZu(JfljegjI3oNE98

literal 1967
zcmbtUO>7%Q6rSC6yc4hOb)33QLz`?A(_{+?5VcjI6_V40Hc&?qE*zprtBrS?EZHAx
zcAa2kOX24b1VTAf3JB#u#i1w?9O2kI7bm@#Rej+nw6{V|?Wr@fYuBg|J#?jg^XAR_
zzBg~)oB1`7hynavTYLM1hY)~2$fWhLp>l8(D_cMV^I!>R%uQyV(b&(xJX_)9Ncm;F
zxU}kOuC_9+mc3=^_w^gn-#2dUZ~T1k$M5g`^zom+e6_#*>HTju_iugo*Y=j&=cg{~
z-jse_Et_6$RrOTl$FHdF@|^0rYYx)<<oh}@u2<UgRH0&7x`&M7v|U7%lIK6MOzD9I
zzGawt;Y#i`KNe~eXV3ZFlNC>Qsaa^L#GbiSMo724cO6sD8=7Y7Ybw%xVaCmAmSMl=
z>c|&o+)IvCQte7!w-&J>9Zm~Hr=)9n<3q#td#>rWYI~g~k)S&b={X%)hU*%RO%pRP
z*O4$1^_wzWb<xx{KQrTY@U_i+=<LU5+(NmeBf3dH(ee(a0!>D>)g{a?6qcP*KAebi
zj%#>0d}t^#trFugf`1PG2LRW53siB1S4IIq8I9FA6Ie`*VL+Afx>}f>P|=u+SgSGx
zf{CmGG=vddCTB%zECW2D<zHp1U?=RQ8dv3>W~u_p#8IYbJ34PhExs1P(IZb|v?#?y
zC<cbnyK!{*T+w48lYp7JpNlEp&Ld&QETPtg^XNJxk2uYvi{_DRV?>OJ*P<8`Jp_}a
zm?*`h+L#`UNz{0Z;Sa&2D26Wp?_{eoTDl6pWw+U#upd5Q<lb3CN_C&O$PCqGh)91R
z(kO^@0g4jA6M>%$fVznw&xp+UQF<F4M5>SRbbu&MJQ74Ci4ciM5z#|LnuuO3FkZmj
z9o`jJ=Fkzclp%t=L3ll(lKZLP8@6f`b##nc>45qIoeb!Bpp)UF5zEoarY?<izEUI7
zvg%5<BdH#KR~E~jF3F<b+vzf1bet7@SIK$!{F3P`s;2A5J6+I;U`_W3jeo3jZQN?V
zEA$u;Id(Ka0Ga>#1-I0Fk_FwqpUkzkHjR*jWavk1)e85+DwfZ!s%Ah<j)CS+kuIr<
z6n>9}r`}j7<a4vR%hL;C+y(MZFDQy(8=j(!mny!XC`&;Sih@pKIH{BSD(;JQ(BOr-
zIJCzPHR1Wj==m@CFS_gL>@Iw<Ar98zAYOg|Kx&Tt2LL$7HsRRaWM*^m>+GH6;0D*|
zKS=<a+0Vs>nBIs{vQvBfsV2-d#wG(Yc^95;h}k;KhGc7$Yz>o5Jd^CgE`Om3&pg9#
zqqfJNXu`9N;c>d3v0W%N#Qr+$$07fBu`Wt`ywrrRH%86{+a2D;8x;rYaNusNul~a1
z?K8JW>&M@@6T4cETs^=C2WDl?=M_bBii$!M)ilF%{Q;ntumh5@cmyv7t@$Q;1y9K(
cbV;v2;24Ja4NUwSfdaeE9~{jxd4|Fs1BgNelmGw#

diff --git a/auth/__pycache__/elt_auth.cpython-312.pyc b/auth/__pycache__/elt_auth.cpython-312.pyc
deleted file mode 100644
index d3fd43fb31b1ac8fe0f7d770128d67d7aea2ac48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2402
zcmcImO>7fK6rSC+y}RBd8*GCeq9hIuI8I5TP@xhEsrWHJEjUymNaV6wvXfxPKVfza
zNwkrA;9w*q;7~=CDmAJ&1QDt9RC=l^6;!DgFRo;>lv7W+MWj_Ldg&Y6OGrXnE*;5l
z-pqUNn{R&JTmRJ9=ta;@cI;1m=|<>RI&hk+uB`0^WdUhOW724h_H3HTuwyKPSacF;
z+;yb6?z1)TF>aQLxmV~Q5o2sQe&)P#Y<T#i({Uwn<ZOJr=2eqSeXte+WdUI{#%O4a
z)tKvOjMG?<u30YTvbO=qk-TvkXN}~zY9w>n@%n020Lqht-`Y8l3&><r)#;5QMLjk(
z!`UIaU#Bw9nyk*uA`uz9<D3#4ZM`?yR}q}Xz<KZ)Vcx~S329tf%y{SBRUM_Jd5?%p
zSBma%Q+pF5lha(wZs#oLdDD~Hu_+9OskW_i;Mu-)HWl7F_lmh-@~K^0?Wx^c=QOnJ
zapFwjzdWYkb_kr}|AjvXZ+2cZMc8xn4P5zU!QonE(rXI;;3=+q&H<3gE884A;2v}I
z^<MK%GRu;K&cHh{-EV!je5z+1$<dY@9JG0_$(xMw>b^~{$xg5%D1wY?j?xID!HJt-
zyAa_RbP>&>YiNeMh^{da`qFkf9_#%ZJ>75T8EZ@snrx8EP4Vf=ID?6rKA)SyS(tH+
z>X@w1+=;O^4_P`odiuC6f-+*LMqUROk1?0bPUKc-I?)JCoz++9OSQe=7SC$ulNk(#
z#{9IV8d#Y~;<QEs1&U4aVnLg)Rge*zo5Tj8nQXiA`J@H}=z`u0YC4bOgye|bbi^=7
z@>1S##*<fdP1mOSGC2*WbwYXAJF1g?>h!eUH=ZNdG15%81<Jz!RyLozl)~eNZZ{my
zVLg#E;xkFzu(@pRnk`U|xm*_8T;3Qb%`}oHcsi|)V_T#~Sk6#wm#$vLwnWdSz8{+d
zLrek-PEXL7D|rm4BFriVJy_dY?G(DhDqli*kya{bZrVH$P+(PCBsilcv&rlvoCm<`
z5}3p5?PaLG`+gP5XFpwmDt*(lb^}%F1r^V=1HX+Gw(oVj2VnJ2;hsN1l|bvl@SWju
zAZi7o%W^4jpddb#Llu8;)y0XSUs~F}X!)#Vaj?|VTlnyI0g3yb3;oXouzJK$#TPF7
zx-DOK*|*p7?X84%Rd%+nx{<$k4RQXa!m-sR<ZmteB9<>w_C+mUbV(?84_e)W<?h2)
z_u-OnsK8gGrdvZdhRRZ>C3P+Zic)7u>U$9UrsM05A6*YRN&{z~NM|V@5857DNZd)3
z13gxt=RsF7&{GP$_b~ch|F`|ck4GQ&mkwUA0v8HmMGD-WDF<U#Ft&817>t#I15c!Z
zN?X_BOgTDeMF$^}Vsx++J!-WbEgZX<s5Hp8PTe@QcxG{^aO&rVebt@AiVKJC94h-G
zmOrvI@|AK=Df%NN|KY;%RRINe7WkV|r8#grS(L*?A^hiWAE0fmpC^j)J1-C;hModp
z4*I`VL#VmEEcaM)&n81VY7Ug;uqB5#7+&i8;d<_FkH^sW-nRG<`r*Ky6Mpn4Cdc3B
z9vx(;9Fk8obB|?)O22$!H}|-U0lDEb3Lv%5DE%rfAoz^43EOiNs|1sKkl<tw%oAF0
zby^U@VbTko?SK8DD3`ISVKTS--``W+t&d{CzYhAW<lq`8@SnkL3yP9eGgwh<ucAQO
z=F?PfP?RfqHC?k18cOz2F+jz;R8TsE!c_%T^hOZZ(F=BuyL0Uv!?;5=Pil*~$ad&#
zzf&OSKA;-prjoc?Vrozu;a>`eYJ`T!0SKm*Pp2qwbqw<iNzYOLAD$j2^a6pXuJt$b
Ccn-t>

diff --git a/auth/__pycache__/managers.cpython-312.pyc b/auth/__pycache__/managers.cpython-312.pyc
index e8e16901c5bfaaeeebe23ad2aca0c71355b568df..5d42386a0b359aa3ac2faeec8ca0a3a337d0aa83 100644
GIT binary patch
delta 1284
zcmaKrOH30{6o%)v(|75ES6dKDc{QWZ2I~ugh!F%dm`W%lC^n5VV(YYpJ1r4i=mK52
zA$M<#D~WN{xG^qFSZYj+2{A)h8bjhjWq~2Yc+M0`(-<e|*U7!-{^y+k+<C6-MI7&|
zs;nG5oo{og!I~9^mqb^B;XcBNoXE?Tv~|WxI2|{_iH2oPG``efFvrc<mWW{5!q+PT
zQO&tzTDq6bNCLm|p{p=R)^rgk?9m!TEy4{@d770a#R#u0+OzAOTU10vyc163bGO6n
zJRc@ig#~__m|YMg5b9*IvBT4Z3Mi=R78FHaJWu`Xg|VA7vvuP|5-2p8cFDK{wpNL1
zyO2%KCo)U1*w~Q3Qv)7vL$m`_qjWc^<P_LAifed=b|E?e3J<{IKwh*2NQgbQTmtz|
zmR4P=A|7j`^#H+C%;CWWFT#gtKr|wb00cv2K0L2l@`^;`nlV@>rpDZ}_8>XO9@)o9
zfHj$X?7MxfPe7?-2pq#d8WSa1%1MH;GEpbns%j*DW^e>ajCDJvLG+{F$DTU2A80*k
zqG-e<xX0g;6FHcweFCP17RKYr3{+oXqir!E=OraBgP9avJ2155rE0~t;`w}1RLXpX
zP}Mmi<xpN>E?2wp1}rJF>}Q9UO}NIOI9HdCy>@*a&}M@bPSRe?07b>XuCk)cuv}3Y
z?Z;3(b+9k)X6Smy-9zS>P(20053B#oqNr+)N;Hi+#nJCi5w9lw{}lP+g&Dy}>{Qj!
z`LgENMooldn6q}YG`Lr+xz0PKwW6IWpP-hobT#P-5QOm^#+JOKCo$nEK-u>L_vA@k
zgxqKE>h?!k=&5&;hCz(g(qO`(chnBA0=w>M3moP{r>F@x_S-7vW6wN3Fz$`#ELmp1
zJt=7AruXV-3q}VKA;fXSX~Y0x2r-7ZjEDkOIU2xsKf-zdE8Fv~cW4{9CfGH{RlAr<
zWahG=d@d;~6hCs>z}C(LnZCDvS{t*bFpV1})m?LcIxFU7X@FjX4FW%<74Sn(2-)Cl
bn_TD{H~g6!-sHM>tmkzkN`7(LpQiB_C3^!M

literal 14754
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
Dn^T;I

diff --git a/auth/cookie.py b/auth/cookie.py
deleted file mode 100644
index 0052c3d..0000000
--- a/auth/cookie.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django.http import HttpResponse
-
-
-def GetDefaultAvatar():
-    from io import BytesIO
-    from PIL import Image
-    img = Image.new('RGB', (256, 256), (200, 200, 200))
-    buf = BytesIO()
-    img.save(buf, format='PNG')
-    buf.seek(0)
-    return HttpResponse(buf.read(), content_type='image/png')
diff --git a/auth/managers.py b/auth/managers.py
index e310514..8267fef 100644
--- a/auth/managers.py
+++ b/auth/managers.py
@@ -1,11 +1,10 @@
 import uuid
 from django.utils import timezone as _timezone
 
-from gvsdsdk.models import Role, UserRole, RolePermission, Permission, Shop, RoleShop, Position, PositionTemplate, PositionTemplatePermission
+from gvsdsdk.models import Role, UserRole, RolePermission, Permission
 from gvsdsdk.model_utils import _GetUserModel
 
-# NOTE: 类型注解（L8）暂缓——本模块含 RoleManager/ShopManager/PositionManager 共 20+ 静态方法，
-# 全量补充参数与返回值注解工作量较大且易引入回归，后续单独迭代处理。
+# NOTE: 类型注解暂缓——RoleManager 静态方法较多，全量补充注解工作量较大且易引入回归，后续单独迭代处理。
 
 
 class RoleManager:
@@ -139,151 +138,3 @@ class RoleManager:
         perm_uuids = qs.values_list('PermUUID', flat=True)
         return Permission.objects.filter(PermUUID__in=perm_uuids, PermStatus=1)
 
-
-class ShopManager:
-    """商铺管理器——提供商铺创建、角色关联、查询"""
-
-    @staticmethod
-    def CreateShop(Name, CompanyUUID, Code='', ShopType=0, **Kwargs):
-        """创建商铺"""
-        shop = Shop(
-            ShopUUID=uuid.uuid4().bytes,
-            CompanyUUID=CompanyUUID,
-            ShopName=Name,
-            ShopCode=Code,
-            ShopType=ShopType,
-            ShopStatus=1,
-            ShopAddress=Kwargs.get('ShopAddress', ''),
-            ShopContact=Kwargs.get('ShopContact', ''),
-            ShopPhone=Kwargs.get('ShopPhone', ''),
-            ShopDesc=Kwargs.get('ShopDesc', ''),
-            CreateTime=_timezone.now(),
-            UpdateTime=_timezone.now(),
-        )
-        shop.save()
-        return shop
-
-    @staticmethod
-    def AssignRole(RoleUUID, ShopUUID, IsMainShop=False):
-        """为角色关联商铺"""
-        role_shop = RoleShop(
-            RoleShopUUID=uuid.uuid4().bytes,
-            RoleUUID=RoleUUID,
-            ShopUUID=ShopUUID,
-            IsMainShop=1 if IsMainShop else 0,
-            CreateTime=_timezone.now(),
-        )
-        role_shop.save()
-        return role_shop
-
-    @staticmethod
-    def RemoveRole(RoleUUID, ShopUUID):
-        """移除角色与商铺的关联"""
-        deleted, _ = RoleShop.objects.filter(RoleUUID=RoleUUID, ShopUUID=ShopUUID).delete()
-        return deleted > 0
-
-    @staticmethod
-    def GetShopsForRole(RoleUUID):
-        """获取角色关联的所有商铺"""
-        shop_uuids = RoleShop.objects.filter(RoleUUID=RoleUUID).values_list('ShopUUID', flat=True)
-        return Shop.objects.filter(ShopUUID__in=shop_uuids)
-
-    @staticmethod
-    def GetRolesForShop(ShopUUID):
-        """获取商铺关联的所有角色"""
-        role_uuids = RoleShop.objects.filter(ShopUUID=ShopUUID).values_list('RoleUUID', flat=True)
-        return Role.objects.filter(RoleUUID__in=role_uuids)
-
-    @staticmethod
-    def GetMainShopForRole(RoleUUID):
-        """获取角色的主商铺"""
-        rs = RoleShop.objects.filter(RoleUUID=RoleUUID, IsMainShop=1).first()
-        if rs:
-            return Shop.objects.filter(ShopUUID=rs.ShopUUID).first()
-        return None
-
-    @staticmethod
-    def GetShopsForCompany(CompanyUUID):
-        """获取公司下的所有商铺"""
-        return Shop.objects.filter(CompanyUUID=CompanyUUID, ShopStatus=1)
-
-
-class PositionManager:
-    """职务管理器——提供人事职务标签创建、岗位模板管理"""
-
-    @staticmethod
-    def CreatePosition(Name, TenantUUID, Code='', Level=0, **Kwargs):
-        """创建人事职务标签"""
-        position = Position(
-            PositionUUID=uuid.uuid4().bytes,
-            TenantUUID=TenantUUID,
-            PositionName=Name,
-            PositionCode=Code,
-            PositionLevel=Level,
-            PositionStatus=1,
-            PositionDesc=Kwargs.get('PositionDesc', ''),
-            CreateTime=_timezone.now(),
-            UpdateTime=_timezone.now(),
-        )
-        position.save()
-        return position
-
-    @staticmethod
-    def GetPositionsForTenant(TenantUUID):
-        """获取租户下的所有职务"""
-        return Position.objects.filter(TenantUUID=TenantUUID, PositionStatus=1)
-
-    @staticmethod
-    def CreatePositionTemplate(Name, TenantUUID, Code='', **Kwargs):
-        """创建岗位模板"""
-        template = PositionTemplate(
-            PositionTemplateUUID=uuid.uuid4().bytes,
-            TenantUUID=TenantUUID,
-            TemplateName=Name,
-            TemplateCode=Code,
-            TemplateStatus=1,
-            TemplateDesc=Kwargs.get('TemplateDesc', ''),
-            CreateTime=_timezone.now(),
-            UpdateTime=_timezone.now(),
-        )
-        template.save()
-        return template
-
-    @staticmethod
-    def AssignPermToTemplate(TemplateUUID, PermUUID):
-        """为岗位模板关联权限"""
-        ptp = PositionTemplatePermission(
-            PTPermUUID=uuid.uuid4().bytes,
-            PositionTemplateUUID=TemplateUUID,
-            PermUUID=PermUUID,
-            CreateTime=_timezone.now(),
-        )
-        ptp.save()
-        return ptp
-
-    @staticmethod
-    def RemovePermFromTemplate(TemplateUUID, PermUUID):
-        """移除岗位模板与权限的关联"""
-        deleted, _ = PositionTemplatePermission.objects.filter(
-            PositionTemplateUUID=TemplateUUID, PermUUID=PermUUID
-        ).delete()
-        return deleted > 0
-
-    @staticmethod
-    def GetPermsForTemplate(TemplateUUID):
-        """获取岗位模板关联的所有权限"""
-        perm_uuids = PositionTemplatePermission.objects.filter(
-            PositionTemplateUUID=TemplateUUID
-        ).values_list('PermUUID', flat=True)
-        return Permission.objects.filter(PermUUID__in=perm_uuids, PermStatus=1)
-
-    @staticmethod
-    def GetTemplatesForTenant(TenantUUID):
-        """获取租户下的所有岗位模板"""
-        return PositionTemplate.objects.filter(TenantUUID=TenantUUID, TemplateStatus=1)
-
-    @staticmethod
-    def CopyTemplateToRole(TemplateUUID, RoleName, TenantUUID):
-        """从岗位模板复制权限到新角色"""
-        template = PositionTemplate.objects.get(PositionTemplateUUID=TemplateUUID)
-        return template.CopyToRole(RoleName, TenantUUID)
diff --git a/db_router.py b/db_router.py
index b74abed..accf15f 100644
--- a/db_router.py
+++ b/db_router.py
@@ -35,14 +35,8 @@ class SAASDatabaseRouter:
         GVSDSDK_SAAS_READ_ONLY = True     # 默认 True（子服务器只读）
     """
 
-    # gvsdsdk 内所有模块前缀
-    _GVSDSDK_MODULES = frozenset({
-        'gvsdsdk.models',
-        'gvsdsdk.commission.models',
-        'gvsdsdk.payment.models',
-    })
-
-    # gvsdsdk 内所有 app_label
+    # gvsdsdk 内所有模块前缀（startswith 判定覆盖全部子模块，
+    # 无需维护显式模块名清单，避免新增模块时遗漏）
     _GVSDSDK_APP_LABELS = frozenset({
         'gvsdsdk',
     })
@@ -57,9 +51,9 @@ class SAASDatabaseRouter:
 
     def _is_gvsdsdk_model(self, model):
         """判断模型是否属于 gvsdsdk"""
-        # 按模块路径判断
+        # 按模块路径判断（gvsdsdk.* 前缀全覆盖）
         module = getattr(model, '__module__', '')
-        if module in self._GVSDSDK_MODULES or module.startswith('gvsdsdk.'):
+        if module.startswith('gvsdsdk.'):
             return True
         # 按 app_label 判断
         app_label = getattr(model._meta, 'app_label', '')
diff --git a/form_service.py b/form_service.py
index ea2cb09..c4488fd 100644
--- a/form_service.py
+++ b/form_service.py
@@ -14,9 +14,8 @@
             'MyModel2': MyModel2,
         }
 
-    # 子服务器 views.py
-    from gvsdsdk.form_service import FormServiceAPIView
-    from .form_service import FormService
+    # 子服务器 views.py 中直接实例化 FormService 使用
+    # （FormServiceBase 提供 ORM 能力，视图层由子服务器自行封装）
 """
 
 import uuid
@@ -87,6 +86,17 @@ class FormServiceBase:
         if val is None or val == '':
             if getattr(field, 'null', False):
                 return None
+            # 非空字段：数值类型返回默认值或0，布尔类型返回 False，其他类型返回空字符串
+            field_type = field.__class__.__name__
+            if field_type in ('SmallIntegerField', 'IntegerField', 'BigIntegerField',
+                              'PositiveIntegerField', 'PositiveSmallIntegerField',
+                              'FloatField', 'DecimalField'):
+                default = getattr(field, 'default', None)
+                if default is not None:
+                    return default
+                return 0
+            if field_type == 'BooleanField':
+                return False
             return val
         field_type = field.__class__.__name__
         if field_type == 'UUIDField' and isinstance(val, str):
@@ -115,12 +125,25 @@ class FormServiceBase:
                 return val
         if field_type == 'DateTimeField' and isinstance(val, str):
             try:
-                return datetime.datetime.fromisoformat(val)
+                dt = datetime.datetime.fromisoformat(val)
+                # USE_TZ=False + MySQL 不接受 aware datetime：
+                # 统一转 naive UTC（UTC-0 存储，展示时由前端按用户时区转换）
+                if dt.tzinfo is not None:
+                    dt = dt.astimezone(datetime.timezone.utc).replace(tzinfo=None)
+                return dt
             except (ValueError, TypeError):
                 return val
-        if hasattr(field, 'max_length') and field.max_length is not None and isinstance(val, str) and len(val) > field.max_length:
-            logger.warning('字段 %s 值超长（%d > %d），已截断', getattr(field, 'name', '?'), len(val), field.max_length)
-            val = val[:field.max_length]
+        if field_type in ('BooleanField', 'NullBooleanField') and isinstance(val, str):
+            low = val.strip().lower()
+            if low in ('true', '1', 't', 'yes'):
+                return True
+            if low in ('false', '0', 'f', 'no'):
+                return False
+            return val
+        max_length = getattr(field, 'max_length', None)
+        if max_length and isinstance(val, str) and len(val) > max_length:
+            logger.warning('字段 %s 值超长（%d > %d），已截断', getattr(field, 'name', '?'), len(val), max_length)
+            val = val[:max_length]
         return val
 
     @staticmethod
@@ -141,7 +164,6 @@ class FormServiceBase:
             'FloatField': 'number',
             'DecimalField': 'number',
             'BooleanField': 'boolean',
-            'NullBooleanField': 'boolean',
             'DateTimeField': 'datetime',
             'DateField': 'date',
             'TimeField': 'time',
diff --git a/model_base.py b/model_base.py
index 3324e1c..c522eda 100644
--- a/model_base.py
+++ b/model_base.py
@@ -24,12 +24,7 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Callable, Dict, Generic, Optional, Tuple, Type, TypeVar, Union
-
-try:
-    from typing import Self
-except ImportError:
-    from typing_extensions import Self
+from typing import Any, Callable, Dict, Generic, Optional, Self, Tuple, Type, TypeVar, Union
 
 from django.db import models
 from django.db.models import Q
diff --git a/models.py b/models.py
index 333e618..5fd6ad0 100644
--- a/models.py
+++ b/models.py
@@ -7,7 +7,7 @@
 供子服务器直接进行跨服务器 ORM 查询。
 
 权限体系四大分层：
-    1. 组织人事层：Tenant → Company → Department，员工通过 UserRole.DeptUUID 归属部门
+    1. 组织人事层：Tenant → Company → Department，员工通过 UserRoleDepartment/UserRoleWorkgroup 关联表归属部门/工作组
     2. 岗位模板层：PositionTemplate + PositionTemplatePermission，权限初始化快照
     3. 角色权限载体层：Role + RolePermission，运行时鉴权实体
     4. 鉴权规则层：操作权限校验（角色汇总）+ 数据权限校验（组织属性）
@@ -15,11 +15,13 @@
 使用方式（子服务器）：
     from gvsdsdk.models import Permission, Role, UserRole, RolePermission
 
-    # 查询所有启用的用户（需在业务子类中定义具体 User 模型）
-    users = User.objects.filter(UserAccountLicense=1)
+    # 查询所有启用的用户（User 为抽象基类，需经 _GetUserModel 获取具体模型）
+    from gvsdsdk.model_utils import _GetUserModel
+    UserModel = _GetUserModel()
+    users = UserModel.objects.filter(UserAccountLicense=1)
 
     # 或配置 DatabaseRouter 后直接使用
-    users = User.objects.filter(UserAccountLicense=1)
+    users = UserModel.objects.filter(UserAccountLicense=1)
 
 设计原则：
     1. 独立：不依赖 gvsds 内部模块，可在任意 Django 项目中独立使用
@@ -29,8 +31,7 @@
     5. 租户隔离：所有权限相关数据依附于独立租户空间，不同租户互相不可见
 
 注意：User 为抽象基类，仅包含 SAAS 主库标准字段。
-      业务子类应继承 User 并在单独文件中添加业务字段和方法。
-      参见 gvsdsdk/business_models.py。
+      业务子类应继承 User 并添加业务字段与方法（如 gvsds.apps.core.models.User）。
 """
 
 import uuid as _uuid
@@ -186,8 +187,7 @@ class User(QModel):
     """用户表——系统核心身份模型（抽象基类，映射 SAAS 主库 User 表标准字段）
 
     本类为抽象基类，仅包含 SAAS 主库 User 表的标准字段和方法。
-    业务子类应继承本类，在单独文件中添加业务字段和方法。
-    参见 gvsdsdk/business_models.py。
+    业务子类应继承本类并添加业务字段与方法（如 gvsds.apps.core.models.User）。
     """
 
     UserUUID = UUIDField(primary_key=True, db_column='UserUUID', verbose_name='用户UUID', default=_uuid.uuid4)
@@ -202,6 +202,8 @@ class User(QModel):
     UserTele = models.CharField(max_length=16, null=True, blank=True, db_column='UserTele', verbose_name='电话')
     UserCreateTime = models.DateTimeField(default=_UtcNow, db_column='UserCreateTime', verbose_name='创建时间')
     UserLastLoginDate = models.DateTimeField(default=_UtcNow, db_column='UserLastLoginDate', verbose_name='最后登录')
+    IsStaff = models.BooleanField(default=False, db_column='IsStaff', verbose_name='是否员工')
+    IsSuperuser = models.BooleanField(default=False, db_column='IsSuperuser', verbose_name='是否超级用户')
 
     # Django auth 框架必需（由具体子类覆盖）
     USERNAME_FIELD = 'UserName'
@@ -537,11 +539,13 @@ class UserRole(QModel):
     通过 CompanyUUID 标识该用户-角色关联所属的公司，
     用于菜单按公司差异化显示、数据权限按公司过滤等场景。
     同一用户在不同公司下可绑定不同角色。
-    DeptUUID、WorkgroupUUID 为可选字段，用于将关联进一步限定到部门或工作组。
     RoleType 标识该用户在部门/工作组中的角色类型：0=普通成员/部门员工，1=组长/部门负责人。
     RoleName 为可选的角色名覆盖：非空时前端展示用此名，为空时回退到 Role.RoleName。
     这避免了为每个用户单独建角色，又能让同角色在不同用户视角下显示差异化名称。
 
+    注意：DeptUUID、WorkgroupUUID 为遗留字段（已废弃）——部门/工作组归属已迁移到
+    UserRoleDepartment/UserRoleWorkgroup 关联表，字段仅保留兼容存量数据，禁止再次写入。
+
     注意：UserUUID/RoleUUID/CompanyUUID/DeptUUID/WorkgroupUUID 在 gvsds 中是 ForeignKey，
     但此处改为 UUIDField 以保持独立性（不支持 select_related 和关联属性访问）。
     """
@@ -719,14 +723,24 @@ class PositionTemplate(QModel):
         ).values_list('PermUUID', flat=True)
         return Permission.objects.filter(PermUUID__in=perm_uuids, PermStatus=1)
 
-    def CopyToRole(self, RoleName, TenantUUID):
-        """从模板复制权限到新角色（一次性复制，后续模板变更不影响已有角色）"""
+    def CopyToRole(self, RoleName, TenantUUID, CompanyUUID=None):
+        """从模板复制权限到新角色（一次性复制，后续模板变更不影响已有角色）
+
+        Args:
+            RoleName: 新角色名称
+            TenantUUID: 新角色所属租户
+            CompanyUUID: 复制出的 RolePermission 所属公司。
+                缺省用系统公司 UUID（与主项目 RolePermission 创建一致），
+                RolePermission.CompanyUUID 为非空字段，漏传会导致插入失败。
+        """
         with transaction.atomic():
             role = Role.objects.create(
                 RoleUUID=_uuid.uuid4().bytes,
                 TenantUUID=TenantUUID,
                 RoleName=RoleName,
             )
+            if CompanyUUID is None:
+                CompanyUUID = _uuid.UUID('00000000-0000-0000-0000-000000000001')
             template_perms = PositionTemplatePermission.objects.filter(
                 PositionTemplateUUID=self.PositionTemplateUUID
             )
@@ -734,6 +748,7 @@ class PositionTemplate(QModel):
                 RolePermission(
                     RolePermUUID=_uuid.uuid4().bytes,
                     RoleUUID=role.RoleUUID,
+                    CompanyUUID=CompanyUUID,
                     PermUUID=tp.PermUUID,
                 )
                 for tp in template_perms
@@ -793,4 +808,4 @@ class Position(QModel):
     def __str__(self):
         return self.PositionName
 
-# （UserDept 表已废弃——员工部门关联改走 UserRole.DeptUUID，不再用独立表）
+# （UserDept 表已废弃——员工部门归属已迁移到 UserRoleDepartment 关联表，不再用独立表）
diff --git a/msync/__pycache__/client.cpython-312.pyc b/msync/__pycache__/client.cpython-312.pyc
index 78db8b919925f2d97d5b90177c61cc24a0891e10..f0ffc981411deef5b4918a1fca22570513ece497 100644
GIT binary patch
delta 2287
zcmaKuZA?>F7{_}`p)F9VKwClRi({6HSg;j&Rfh~M8c?B{$fh@yUZDfqa(e5eqRh8B
zH@3w*$@YEkghVtoBXKiXvVB;xm_V|`tRK`Z(dozOJ}k>(cAn>gAWPN{znuHr|9Q?i
z&-1_c_RguhCoMl&EcrU|JNT{oM%@)l8JoM}g&lg`E?uPHf-X|1*r#*wzE0Qgpr}Pe
zi>CDpu{9L4irA{>v9d9}v^t|_g9c;W@#I)+pbiqbS@^+tFV7{WaW_nvoXiP7n%ry)
zJT`gtPjygi_K8rt*;f9N&?K3_E8Kzd@<lX2!fem0qRY&rxs`43h%rgsn$#(-)1`7K
zKCHz0)HqjsvK);?RaxE+Px2*J1y>82EEPf}G48`eeh3$AF6+cRMFMZ>?psUlSl#nh
z_ngViU(nZS`lkh3%DPtQJ@Z!2oXPW|ev_uZR9MZr;aZ{1fIEk}d^_ALjIN<g<j^Lv
z1~qzI;q{tcw$!ryFlnh5yS-%@@S>1!6p(T`o|iWu8U?cE&Xb8KSCZ{2Z-!k(wJZc`
z(Z<Df4i@rSl;T`*PNTJYq92C=1XYptP{?1#z<PvNAZwK6NPIw+IaV`kO7M6>;p*7Z
zy1W^+ZHVoNc7dsdl+>{rj3Q8zJScEM_lsfO6S!*Kul276Ce39T=c>{iRsn$$|6Wv!
zl~wFqQZi^K4T>PgTJzlkNrQk}{Fe3F-ly;r(E+7nB&x*J=iN@hjgtDsI@sY^Noz5k
zRnPZeHrl!$_LOd8r{LXEC;6fbhHZg$%Vkt(Kdy{!Tv)aN95!d=1V)Pm$S@y{Umm|>
z_0C(pb0#mD;J?YRVSHt>M)=O=V&~z$ZLQeDKemZHGP@tn+MC!VxM}xNI9&eVo!N&U
zU3>7^^+z{8m-L*hxF9|3@D)vB@;(H4?3u@&nQ;VjSrGoJxWxwH>&ngjNAUJ@@9=GS
ziBB<gbIP#t7WP=G$QH}Hl$gT9s?sqO9vM+$g9^{ZS=1Zs2=9UhXMpX7sI!|5!K|~o
zn2Jo+!1bg8?twp?P3#ENxO~Ffhg@!UC6jig@+8Var8$JD$e*v_=yk+lL>O@t)~v6b
z7{Xx`@xO=RBSIoMv|dy47|w|!Xu$-IMiCs5M4-d6j_$rgJsooUflyHH?cCYh*%y@e
zwTFT{g_4OA$Ttxu5o3sP#A(DC#3{sT#M1eVnw!sI^gQAMf{t(zN0$VWMgcUp_-X#e
z9;eqX_xCDc@LuJZc;JWV4fjo^!+S>WA<O3SZcIg$rz4X^_G8Qszez!M7dF&vXH}Wu
zn!QE`mRQQkTG~_UP@G58VKo|$@qU=!w82G<pvoV`+0>F@97PZcto0vZ??c*ORp-Kh
zTOd^;@MvcC;q`NxMO)m#P-vf9s^ssXhFlkf+y1JFrA}ZIvbjgcR3*tRs9MnwD)~~e
zWt321sS8y5G{(pjSoW+T8ao!(N`S8<`fx}kRQzmSw<3-jfkeQzz8S^Fka*|DQ);$=
zE2Hv|5{@W5$=}9#T905l;9(cxcA%>Q4U)DkZ-wgXRYp@vQhl89Z;l(-FnrQfW5UEz
z9^VZ=H~CCBNy-t{&u{Kz)v&L*S9>A--gwhT_52hCENh5`#moN-T*AVY!Dv$DV=Y|l
zhkv=4?t_-HiYalya}ZRl#q1ae!uKtmtQO3zeG~Znb8>{Cr>BP=9%=Q8H$2~gA}68)
zLC&Ebk#l-6b^t;4AtO;6aZNsrm_fXXp!FO$+KI?ThT(qeX*b=$OQ~F2kXqj=0$D>U
z6^+1nTR9trkK5|Y=>tShj*3YxBfdghg<soh8}Y-e{R_aagtpL&i~ntEJ06duMwD%Q
XR!H!5ojeO&TV?&9KA72BMV0>-`XTz#

delta 2510
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

diff --git a/msync/client.py b/msync/client.py
index eb4f001..024f9e4 100644
--- a/msync/client.py
+++ b/msync/client.py
@@ -50,12 +50,6 @@ def _ResolveMasterURL(master_url):
     return DEFAULT_MASTER_URL
 
 
-def _GenerateChallenge():
-    """生成认证挑战字符串——与 auth.GenerateChallenge 统一格式（时间戳:UUID）"""
-    import time as _time
-    return f'{_time.time():.6f}:{uuid.uuid4().hex}'
-
-
 class ServiceClientError(Exception):
     def __init__(self, Message, StatusCode=None, ResponseBody=None):
         super().__init__(Message)
diff --git a/payment/gateways/_test_write.txt b/payment/gateways/_test_write.txt
deleted file mode 100644
index e69de29..0000000