Merge remote-tracking branch 'origin/master'

liujie

2023-09-28 41c07e4558ed3a1cbdda0711f78cd3a812c06829

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js

@@ -101,7 +101,7 @@
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/tShop/tShop_add_two?id='+$("#id").val()
        content: Feng.ctxPath + '/tShop/tShop_add_two1?id='+$("#id").val()
    });
    this.layerIndex = index;
};