Merge remote-tracking branch 'origin/master' into akun

@@ -622,9 +622,9 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/7/27 15:08
      * @time   :2023/7/27 15:08
      */
      */
     public function getModule($type,$is_custom){
     public function getModule($type,$is_custom){
-        if($is_custom == BTemplate::SOURCE_CUSTOM){
-            $type == BTemplate::TYPE_CUSTOM_DETAIL;
-        }
+//        if($is_custom == BTemplate::SOURCE_CUSTOM){
+//            $type == BTemplate::TYPE_CUSTOM_DETAIL;
+//        }
         $mainModel = new TemplateTypeMain();
         $mainModel = new TemplateTypeMain();
         $info = $mainModel->read(['type'=>$type]);
         $info = $mainModel->read(['type'=>$type]);
         return $info['main_html'];
         return $info['main_html'];