模板合并

@CONTROL/日历部件/MODEL.ts.ftl

@@ -35,11 +35,19 @@
 </#if>
             {
                 name: 'queryStart',
+<<<<<<< HEAD
                 prop: 'start'
             },
             {
                 name: 'queryEnd',
                 prop: 'end'
+=======
+                prop: 'n_start_gtandeq'
+            },
+            {
+                name: 'queryEnd',
+                prop: 'n_end_ltandeq'
+>>>>>>> core/dev
             },
             {
                 name: 'color',
@@ -69,11 +77,19 @@
                     },
                     {
                         name:'start',
+<<<<<<< HEAD
                         prop:'${calendarItem.getBeginTimePSDEField().getCodeName()?lower_case}'
                     },
                     {
                         name:'end',
                         prop:'${calendarItem.getEndTimePSDEField().getCodeName()?lower_case}'
+=======
+                        prop:'n_${calendarItem.getBeginTimePSDEField().getCodeName()?lower_case}_gtandeq'
+                    },
+                    {
+                        name:'end',
+                        prop:'n_${calendarItem.getEndTimePSDEField().getCodeName()?lower_case}_ltandeq'
+>>>>>>> core/dev
                     },
                 ];
                 break;

LICENSE

+MIT License
+
+Copyright (c) 2020 iBiz-R7前端标准模板
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.