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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOperator.java

@@ -30,6 +30,16 @@
    private Integer id;

    private String name;
    /**
     * 微信商户号
     */
    @TableField("merchantNumber")
    private String merchantNumber;
    /**
     * 微信商户全称
     */
    @TableField("merchantName")
    private String merchantName;

    @TableField("userId")
    private Integer userId;