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

无关风月

2 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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

@@ -36,6 +36,11 @@
    @TableField("merchantNumber")
    private String merchantNumber;
    /**
     * 支付宝商户号
     */
    @TableField("merchantNumberAli")
    private String merchantNumberAli;
    /**
     * 微信商户全称
     */
    @TableField("merchantName")